Merge branch '2.0'
authorAlexander Ebert <ebert@woltlab.com>
Wed, 4 Jun 2014 19:44:17 +0000 (21:44 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 4 Jun 2014 19:44:17 +0000 (21:44 +0200)
commit8b8e565ce2045a953cb1ca311cdefe226d473425
tree79fde7536c39cf3568bca281cd015780d91b5224
parentfffbbc144ddeb3c3be4d37baa9211132e66e2b4d
parent2bb12ecbfe0949214e7b6659d91a528ae9f4f6b9
Merge branch '2.0'

Conflicts:
wcfsetup/install/files/js/WCF.min.js
wcfsetup/install/files/js/WCF.js