diff options
| author | Nils Adermann <naderman@naderman.de> | 2015-05-30 10:58:40 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2015-05-30 10:58:40 +0200 |
| commit | f958d05aedddae9704b01ff5fc06112e57ff3efd (patch) | |
| tree | 4c38f030c846df579ef5a00236e01157b537653e /phpBB/phpbb/template/twig/tokenparser/php.php | |
| parent | 3f4206e012e048d5c3c756a66296ca26300314cd (diff) | |
| parent | 01073ffcbf6ecff50071018e2eaaae9cd81fcbbc (diff) | |
| download | forums-f958d05aedddae9704b01ff5fc06112e57ff3efd.tar forums-f958d05aedddae9704b01ff5fc06112e57ff3efd.tar.gz forums-f958d05aedddae9704b01ff5fc06112e57ff3efd.tar.bz2 forums-f958d05aedddae9704b01ff5fc06112e57ff3efd.tar.xz forums-f958d05aedddae9704b01ff5fc06112e57ff3efd.zip | |
Merge branch '3.1.x'
* 3.1.x:
[ticket/13790] Update phpcs
Conflicts:
phpBB/composer.json
phpBB/composer.lock
Diffstat (limited to 'phpBB/phpbb/template/twig/tokenparser/php.php')
| -rw-r--r-- | phpBB/phpbb/template/twig/tokenparser/php.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/phpBB/phpbb/template/twig/tokenparser/php.php b/phpBB/phpbb/template/twig/tokenparser/php.php index 557a70cca1..f11ce35896 100644 --- a/phpBB/phpbb/template/twig/tokenparser/php.php +++ b/phpBB/phpbb/template/twig/tokenparser/php.php @@ -13,7 +13,6 @@ namespace phpbb\template\twig\tokenparser; - class php extends \Twig_TokenParser { /** |