diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-06-21 17:12:58 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-06-21 17:12:58 +0200 |
| commit | a5c971176be81f854772919713da6db506fa7cd1 (patch) | |
| tree | de5c7803fc5e68abd5a629d8d519d4dcd8135c33 /code_sniffer/phpbb/Tests/Commenting/FileCommentUnitTest.php | |
| parent | 4ac5028d2491195e9aecc9b8fea9b5716373160b (diff) | |
| parent | 4828cb21cf86475bc45a34980e88af3db975228b (diff) | |
| download | forums-a5c971176be81f854772919713da6db506fa7cd1.tar forums-a5c971176be81f854772919713da6db506fa7cd1.tar.gz forums-a5c971176be81f854772919713da6db506fa7cd1.tar.bz2 forums-a5c971176be81f854772919713da6db506fa7cd1.tar.xz forums-a5c971176be81f854772919713da6db506fa7cd1.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10776] update min php version 5.3.3 in readme
[ticket/10776] Fixed a couple language changes in docs/README.html.
[ticket/10776] Fixed errors in docs/README.html.
Conflicts:
phpBB/docs/README.html
Diffstat (limited to 'code_sniffer/phpbb/Tests/Commenting/FileCommentUnitTest.php')
0 files changed, 0 insertions, 0 deletions