aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTristan Darricau <github@nicofuma.fr>2016-10-10 09:14:24 +0200
committerTristan Darricau <github@nicofuma.fr>2016-10-10 20:07:33 +0200
commitb2711371f1267a1314ccf1de976d5432c03a2357 (patch)
treebc673b848921ddc9039126675d02da8e18b04ce8
parent35ad0f124933495c8282342679048860d057c362 (diff)
downloadforums-b2711371f1267a1314ccf1de976d5432c03a2357.tar
forums-b2711371f1267a1314ccf1de976d5432c03a2357.tar.gz
forums-b2711371f1267a1314ccf1de976d5432c03a2357.tar.bz2
forums-b2711371f1267a1314ccf1de976d5432c03a2357.tar.xz
forums-b2711371f1267a1314ccf1de976d5432c03a2357.zip
[ticket/14807] s9e/textformatter 0.8.1
PHPBB3-14807
-rw-r--r--phpBB/composer.lock10
-rw-r--r--phpBB/phpbb/template/twig/loader.php1
2 files changed, 5 insertions, 6 deletions
diff --git a/phpBB/composer.lock b/phpBB/composer.lock
index 060eff4f27..9e698f939f 100644
--- a/phpBB/composer.lock
+++ b/phpBB/composer.lock
@@ -649,16 +649,16 @@
},
{
"name": "s9e/text-formatter",
- "version": "0.8.0",
+ "version": "0.8.1",
"source": {
"type": "git",
"url": "https://github.com/s9e/TextFormatter.git",
- "reference": "48158ca7c52ea637ff625e495d6046eb6a4c8efd"
+ "reference": "93f0bc0a1ad829b90b5482c3d2bfc35ee4cfaacf"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/48158ca7c52ea637ff625e495d6046eb6a4c8efd",
- "reference": "48158ca7c52ea637ff625e495d6046eb6a4c8efd",
+ "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/93f0bc0a1ad829b90b5482c3d2bfc35ee4cfaacf",
+ "reference": "93f0bc0a1ad829b90b5482c3d2bfc35ee4cfaacf",
"shasum": ""
},
"require": {
@@ -705,7 +705,7 @@
"parser",
"shortcodes"
],
- "time": "2016-10-09 13:58:36"
+ "time": "2016-10-09 23:40:32"
},
{
"name": "symfony/config",
diff --git a/phpBB/phpbb/template/twig/loader.php b/phpBB/phpbb/template/twig/loader.php
index b2261dd8cd..d2b42852ce 100644
--- a/phpBB/phpbb/template/twig/loader.php
+++ b/phpBB/phpbb/template/twig/loader.php
@@ -12,7 +12,6 @@
*/
namespace phpbb\template\twig;
-use Twig_Loader_Filesystem;
/**
* Twig Template loader