aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/template/twig/node/php.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2013-06-07 00:15:28 +0200
committerJoas Schilling <nickvergessen@gmx.de>2013-06-07 00:15:28 +0200
commit1d7c80b91210337845ae33267131bb82473b9a9f (patch)
treee9a254aa34b872d99244d09e715a8b3371382ec7 /phpBB/phpbb/template/twig/node/php.php
parent8c4670eeb1264e2535021e400d2cf7e2c2028010 (diff)
parentb4b1704a9b2f2c6e7770f478e27c5c408772f3ff (diff)
downloadforums-1d7c80b91210337845ae33267131bb82473b9a9f.tar
forums-1d7c80b91210337845ae33267131bb82473b9a9f.tar.gz
forums-1d7c80b91210337845ae33267131bb82473b9a9f.tar.bz2
forums-1d7c80b91210337845ae33267131bb82473b9a9f.tar.xz
forums-1d7c80b91210337845ae33267131bb82473b9a9f.zip
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11568-develop
* 'develop' of https://github.com/phpbb/phpbb3: (29 commits) [ticket/11588] Also use version.phpbb.com in install_update.php. [ticket/11587] Add functional tests for group teampage settings [ticket/11538] Add admin as admins leader and moderator in memberlist_test [ticket/11587] Pass legend and teampage settings to group_create() [ticket/11586] Move $filedata['thumbnail'] to where it might be returned. [ticket/11586] Combine $filedata['post_attach'] assign into a single statement. [ticket/11586] Use a variable for $cat_id == ATTACHMENT_CATEGORY_IMAGE. [ticket/11586] Combine administrator/moderator checks together. [ticket/11583] Use a new lang key instead of giving the old one a new meaning. [ticket/11122] Add dhruv to active authors [ticket/11122] Remove Oleg and igorw from active authors [ticket/10840] Add check_form_key to acp_groups.php [ticket/11583] Allow FULLTEXT indexes on InnoDB when on MySQL 5.6.4 or higher. [ticket/11409] Add success message after updating group position settings [ticket/11549] Add functional test for ACP Extension Module with Template [ticket/11570] Fix link and make the notice more conspiciuous [ticket/11549] Do not set extension dir path for style in adm/index.php [ticket/11570] Add link back to update process [ticket/11569] Add type parameter and fix language variable [ticket/11569] Add parameter to URL and remove comment ... Conflicts: tests/functional/common_groups_test.php
Diffstat (limited to 'phpBB/phpbb/template/twig/node/php.php')
0 files changed, 0 insertions, 0 deletions