Merge branch '2.0'
authorMarcel Werk <burntime@woltlab.com>
Thu, 10 Jul 2014 13:44:19 +0000 (15:44 +0200)
committerMarcel Werk <burntime@woltlab.com>
Thu, 10 Jul 2014 13:44:19 +0000 (15:44 +0200)
commit5a71d6cdbc407e07c2c4791da29a8a1cde91b910
tree9472e521351f48edb1955f0537b53dfbe5cc63c8
parent35c74e692108b241de3da2f3fda321050d8915e0
parentdcfbcbf8d624939cbec866fcba7901f2490e27c7
Merge branch '2.0'

Conflicts:
wcfsetup/install/files/js/WCF.min.js
wcfsetup/install/files/lib/page/UserPage.class.php