Merge branch '3.0'
authorMatthias Schmidt <gravatronics@live.com>
Mon, 21 Aug 2017 19:11:33 +0000 (21:11 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Mon, 21 Aug 2017 19:11:33 +0000 (21:11 +0200)
commitc98ebfb3729d17084c583031814ba973f9c8757f
treed842f5ecc61fc23e7795a893ad7506a731b66764
parente9af49fadb3b3fdf00f90e3aad6877b8dc27b43b
parent16fe7959c4f54473de6ed190dcdac53344ea6af9
Merge branch '3.0'

# Conflicts:
# wcfsetup/install/files/js/3rdParty/redactor2/redactor.min.js
# wcfsetup/install/files/js/WCF.js
wcfsetup/install/files/js/WCF.js
wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Redactor/DragAndDrop.js