Merge remote-tracking branch 'refs/remotes/origin/2.1' into 3.0
authorAlexander Ebert <ebert@woltlab.com>
Wed, 7 Mar 2018 22:54:10 +0000 (23:54 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 7 Mar 2018 22:54:10 +0000 (23:54 +0100)
commit50f285fb238b134e0932dc7b3be610f084a8bf08
treebdb15c978ec5ed57f650ef58ff89a8b900136b11
parent4d692ffaa3ed91f751a1de7259d332e955ce624a
parent009578b6714a84a2e62db089a08e3485164d8f4a
Merge remote-tracking branch 'refs/remotes/origin/2.1' into 3.0
wcfsetup/install/files/lib/system/bbcode/highlighter/Highlighter.class.php