1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-24 16:21:20 +02:00
Nils Adermann 6956a6eb00 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
2012-05-22 18:11:08 +02:00
..