diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-03-13 10:27:19 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-03-13 10:27:19 +0100 |
| commit | dbebe30c9a109e5be78590c4a49a71122ad411c6 (patch) | |
| tree | bed8526893b134a99d2545ab314d9275ebe06f55 /phpBB/phpbb/template/twig/tokenparser/php.php | |
| parent | d69012ea6d65e938a72f7accca498fc9feb2df0d (diff) | |
| parent | 03eb23cbae5281a0e75274e52d54e2b9250de99a (diff) | |
| download | forums-dbebe30c9a109e5be78590c4a49a71122ad411c6.tar forums-dbebe30c9a109e5be78590c4a49a71122ad411c6.tar.gz forums-dbebe30c9a109e5be78590c4a49a71122ad411c6.tar.bz2 forums-dbebe30c9a109e5be78590c4a49a71122ad411c6.tar.xz forums-dbebe30c9a109e5be78590c4a49a71122ad411c6.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/12176] Reword comment about config entries.
[ticket/12176] Add newest_user_colour to config array to ensure it exists
[ticket/12176] Display correct message when trying to delete founder.
[ticket/12176] Add functional test for founder deletion message.
Conflicts:
tests/test_framework/phpbb_functional_test_case.php
Diffstat (limited to 'phpBB/phpbb/template/twig/tokenparser/php.php')
0 files changed, 0 insertions, 0 deletions