Merge remote-tracking branch 'refs/remotes/origin/3.0'
authorAlexander Ebert <ebert@woltlab.com>
Thu, 27 Jul 2017 13:54:08 +0000 (15:54 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 27 Jul 2017 13:54:08 +0000 (15:54 +0200)
commit614d35a1d7a9cca92a09fa02ab97638f55f0f04e
tree00dfcc2592a4613bd59c62f1dd10478ee2f5a8dd
parentfb75fe82b83662b442e43d875b1f3d167eb94265
parent5aa6f83246b916b5caf8898383e55e31223e746b
Merge remote-tracking branch 'refs/remotes/origin/3.0'

# Conflicts:
# wcfsetup/install/files/acp/js/WCF.ACP.min.js
# wcfsetup/install/files/js/WoltLabSuite.Core.min.js
wcfsetup/install/files/acp/js/WCF.ACP.js
wcfsetup/install/files/acp/templates/rescueMode.tpl
wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Pagination.js