Merge branch '2.0'
authorMarcel Werk <burntime@woltlab.com>
Tue, 15 Jul 2014 15:49:24 +0000 (17:49 +0200)
committerMarcel Werk <burntime@woltlab.com>
Tue, 15 Jul 2014 15:49:24 +0000 (17:49 +0200)
Conflicts:
wcfsetup/install/files/js/WCF.Message.js

1  2 
com.woltlab.wcf/templates/following.tpl
com.woltlab.wcf/templates/ignoredUsers.tpl