Merge branch 'next' of github.com:WoltLab/WCF into next
authorAlexander Ebert <ebert@woltlab.com>
Wed, 17 May 2017 14:18:38 +0000 (16:18 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 17 May 2017 14:18:38 +0000 (16:18 +0200)
commit6ef618c7f6df21ce72f14191d12652b4f578ec5a
tree1b3e9f749e4376014d023c8c3cdcdacc92c904eb
parent8931233d246fd74786571ea3d258f40d1dbf6c9d
parent0cfbf729a48dd0298b5e80d719665bed3330a9bc
Merge branch 'next' of github.com:WoltLab/WCF into next
com.woltlab.wcf/templates/headIncludeJavaScript.tpl
wcfsetup/install/files/acp/templates/header.tpl
wcfsetup/install/files/js/WoltLabSuite/Core/Controller/Media/List.js
wcfsetup/install/files/js/WoltLabSuite/Core/Media/List/Upload.js
wcfsetup/install/files/js/WoltLabSuite/Core/Media/Upload.js
wcfsetup/install/files/js/WoltLabSuite/Core/Upload.js