Merge remote-tracking branch 'refs/remotes/origin/3.0'
authorAlexander Ebert <ebert@woltlab.com>
Wed, 20 Dec 2017 12:40:50 +0000 (13:40 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 20 Dec 2017 12:40:50 +0000 (13:40 +0100)
commit4d8355e71730b419a47df75f90e9e38eec7002d5
treee65092bbfd9d8e4877e694f2efa20a2425bf5f9d
parent716be31072d2a4d79d237939d4bca242778845f6
parent07c4210ab3da04f546a1d1928776732166914808
Merge remote-tracking branch 'refs/remotes/origin/3.0'

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