diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-05-06 22:11:33 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-05-06 22:11:33 +0200 |
| commit | a97d9d4b899c424530e53d813c71eee192262e40 (patch) | |
| tree | fa692d5bba3e49c60607b6a578aba5cd92649687 /phpBB/includes/class_loader.php | |
| parent | 01eded7cc2b206cce593a389f09259c25e5107ff (diff) | |
| parent | 841f1e492204b67443f9595e2ecdb571e74aabe9 (diff) | |
| download | forums-a97d9d4b899c424530e53d813c71eee192262e40.tar forums-a97d9d4b899c424530e53d813c71eee192262e40.tar.gz forums-a97d9d4b899c424530e53d813c71eee192262e40.tar.bz2 forums-a97d9d4b899c424530e53d813c71eee192262e40.tar.xz forums-a97d9d4b899c424530e53d813c71eee192262e40.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/11144] Add missing {FORUM_NAME} variable
[ticket/11144] Add missing {FORUM_NAME} variable
Conflicts:
phpBB/download/file.php
phpBB/styles/prosilver/template/login_forum.html
Diffstat (limited to 'phpBB/includes/class_loader.php')
0 files changed, 0 insertions, 0 deletions