Merge remote-tracking branch 'refs/remotes/origin/3.0'
authorAlexander Ebert <ebert@woltlab.com>
Thu, 7 Sep 2017 12:01:55 +0000 (14:01 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 7 Sep 2017 12:01:55 +0000 (14:01 +0200)
commitdbe78d073eae99d31aa0dd98ca1df51a9d6ce15b
treead5300dea25aa0b614a1ed58aaf950fc0ad6a354
parent54e8ab7b729ce58b0cd82e378eb5e1ece1b0935b
parenta61d909f1602be648c3f09927d1be264d2aeff3d
Merge remote-tracking branch 'refs/remotes/origin/3.0'

# Conflicts:
# wcfsetup/install/files/js/3rdParty/redactor2/redactor.min.js