diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-08-15 01:40:08 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-08-15 01:40:08 +0200 |
| commit | 1ac1b9b7ee1f1904503b28c00dc7f86a34c007b3 (patch) | |
| tree | e5d609354d5e582c80092213bd6f094a87003862 /tests/test_framework/phpbb_functional_test_case.php | |
| parent | 585f692e3168203645bf40d21c51309ab6572b68 (diff) | |
| parent | d089f9693accf9cb6a1fbabb5545b340a963b501 (diff) | |
| download | forums-1ac1b9b7ee1f1904503b28c00dc7f86a34c007b3.tar forums-1ac1b9b7ee1f1904503b28c00dc7f86a34c007b3.tar.gz forums-1ac1b9b7ee1f1904503b28c00dc7f86a34c007b3.tar.bz2 forums-1ac1b9b7ee1f1904503b28c00dc7f86a34c007b3.tar.xz forums-1ac1b9b7ee1f1904503b28c00dc7f86a34c007b3.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/11775] Fix doc blocks syntax
[ticket/11775] Remove spaces at line ends
[ticket/11775] Split test into multiple steps
[ticket/11775] Add functional test for moving the last post
[ticket/11775] Backport moving of the posting functions to 3.0
[ticket/11775] Fix error when moving the last post to another topic
Conflicts:
tests/test_framework/phpbb_functional_test_case.php
Diffstat (limited to 'tests/test_framework/phpbb_functional_test_case.php')
| -rw-r--r-- | tests/test_framework/phpbb_functional_test_case.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php index de3611c4cc..ce748bb9cf 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -957,7 +957,7 @@ class phpbb_functional_test_case extends phpbb_test_case ); } - /* + /** * Returns the requested parameter from a URL * * @param string $url |