Merge remote-tracking branch 'refs/remotes/origin/2.1' into 3.0
authorAlexander Ebert <ebert@woltlab.com>
Sun, 8 Apr 2018 13:30:25 +0000 (15:30 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sun, 8 Apr 2018 13:30:25 +0000 (15:30 +0200)
commitd6a96d433f8d7c1d7075ac9e815cef8763814794
tree10a9f15a88c821f526582f151e9c9a1c1497dbd2
parent728cf875c168eda93444067672abd9241487ddd5
parent6e019f83957e426bcdcf7dcee1dfb7f53909fa31
Merge remote-tracking branch 'refs/remotes/origin/2.1' into 3.0
wcfsetup/install/files/lib/system/bbcode/highlighter/Highlighter.class.php
wcfsetup/install/files/lib/system/image/adapter/GDImageAdapter.class.php
wcfsetup/install/files/lib/system/image/adapter/ImagickImageAdapter.class.php