diff options
| author | Nils Adermann <naderman@naderman.de> | 2012-05-22 18:11:08 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2012-05-22 18:11:08 +0200 |
| commit | 6956a6eb00e168ebb8b382607f34c98fe174f060 (patch) | |
| tree | 021f0326d9b578d21e93b2116a1ceefd8901637c /tests/bbcode/parser_test.php | |
| parent | c7268b17c4b95f0bf0ce3a07f78d2f9d4ffe2d64 (diff) | |
| parent | 5d5049710c8e5109408ff06f35c362bac2066417 (diff) | |
| download | forums-6956a6eb00e168ebb8b382607f34c98fe174f060.tar forums-6956a6eb00e168ebb8b382607f34c98fe174f060.tar.gz forums-6956a6eb00e168ebb8b382607f34c98fe174f060.tar.bz2 forums-6956a6eb00e168ebb8b382607f34c98fe174f060.tar.xz forums-6956a6eb00e168ebb8b382607f34c98fe174f060.zip | |
Merge branch 'develop-olympus' into develop
By David King
via David King (1) and Nils Adermann (1)
* develop-olympus:
[task/functional] Use proper format for @var doc blocks.
[task/functional] Fix $lang_path variable
[task/functional] Change property visibility, remove globals, reword comment
[task/functional] Make sure missing language values are handled properly
[task/functional] Increase code coverage for functional tests
Conflicts:
tests/test_framework/phpbb_functional_test_case.php
Diffstat (limited to 'tests/bbcode/parser_test.php')
0 files changed, 0 insertions, 0 deletions