diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-06-24 16:28:57 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-06-24 16:28:57 +0200 |
| commit | c1b16930989774051fbc84c8e5634dd83aae7835 (patch) | |
| tree | 2f8f1e93bd0cd4b857de61fada597782923e4576 /phpBB | |
| parent | 510f704bc82900c6408e55bf7240aec5d29b9f42 (diff) | |
| parent | eb11c80b2309cc84a7a33fb1b8fb45ca581dabdf (diff) | |
| download | forums-c1b16930989774051fbc84c8e5634dd83aae7835.tar forums-c1b16930989774051fbc84c8e5634dd83aae7835.tar.gz forums-c1b16930989774051fbc84c8e5634dd83aae7835.tar.bz2 forums-c1b16930989774051fbc84c8e5634dd83aae7835.tar.xz forums-c1b16930989774051fbc84c8e5634dd83aae7835.zip | |
Merge pull request #3683 from s9e/ticket/13921
[ticket/13921] Fix block BBCodes inside of inline BBCodes
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/composer.lock | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/composer.lock b/phpBB/composer.lock index 2d965ecbee..27dbc48321 100644 --- a/phpBB/composer.lock +++ b/phpBB/composer.lock @@ -220,12 +220,12 @@ "source": { "type": "git", "url": "https://github.com/s9e/TextFormatter.git", - "reference": "4c124782e8f74cc462c4f27e81f81192b2853408" + "reference": "85ac4557e7fc504e74ec0a672680af8481fe329c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/4c124782e8f74cc462c4f27e81f81192b2853408", - "reference": "4c124782e8f74cc462c4f27e81f81192b2853408", + "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/85ac4557e7fc504e74ec0a672680af8481fe329c", + "reference": "85ac4557e7fc504e74ec0a672680af8481fe329c", "shasum": "" }, "require": { @@ -270,7 +270,7 @@ "parser", "shortcodes" ], - "time": "2015-05-30 02:58:41" + "time": "2015-06-13 12:25:49" }, { "name": "symfony/config", |