aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/textformatter/s9e/bbcode_merger.php
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '3.2.x' into 3.3.xMarc Alexander2019-11-281-5/+21
|\
| * [ticket/16228] Fix BBCodes mergingJoshyPHP2019-11-251-5/+21
* | [ticket/16072] Update s9e/text-formatterJoshyPHP2019-05-311-3/+3
|/
* [ticket/15527] Skip malformed BBCodes during merge_duplicate_bbcodes migrationJoshyPHP2018-01-221-0/+3
* [ticket/15468] Add a service to merge duplicate BBCodesJoshyPHP2017-12-101-0/+180