diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-02-17 17:11:55 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-02-17 17:11:55 -0500 |
| commit | f24fe7b09e2d4140f4a0cd4b6ff9caf85d007cb3 (patch) | |
| tree | 5ed85774d538c998a26a88bbeff95e10d6ac32b8 /git-tools | |
| parent | 9c268a21ddc84f5048443a9af448134dbcbbe669 (diff) | |
| parent | 676daf3076336429bdc824c46b9603bd09f9c858 (diff) | |
| download | forums-f24fe7b09e2d4140f4a0cd4b6ff9caf85d007cb3.tar forums-f24fe7b09e2d4140f4a0cd4b6ff9caf85d007cb3.tar.gz forums-f24fe7b09e2d4140f4a0cd4b6ff9caf85d007cb3.tar.bz2 forums-f24fe7b09e2d4140f4a0cd4b6ff9caf85d007cb3.tar.xz forums-f24fe7b09e2d4140f4a0cd4b6ff9caf85d007cb3.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9944] Add empty line before the while() so you can better read the code
[ticket/9944] Extension groups naming don't use users' language in ACP
Conflicts:
phpBB/install/database_update.php
Diffstat (limited to 'git-tools')
0 files changed, 0 insertions, 0 deletions