Merge branch '2.0'
authorMarcel Werk <burntime@woltlab.com>
Sun, 8 Mar 2015 13:03:44 +0000 (14:03 +0100)
committerMarcel Werk <burntime@woltlab.com>
Sun, 8 Mar 2015 13:03:44 +0000 (14:03 +0100)
commit995b4b6ee25d27337b3bff72ccf76a0d6282bb93
treeedbffaaca510ee06748bc24e6283450f5e241d57
parent34540683af5e0c8f06d5507ed4b5d7f5c51bab1b
parent831586de60fd07005d633dbcfb85f854e2da1c7b
Merge branch '2.0'

Conflicts:
com.woltlab.wcf/templates/user.tpl
com.woltlab.wcf/templates/userInformationHeadline.tpl
com.woltlab.wcf/templates/usersOnlineList.tpl
com.woltlab.wcf/templates/authorSidebarBox.tpl
com.woltlab.wcf/templates/user.tpl
com.woltlab.wcf/templates/userBirthdayList.tpl
com.woltlab.wcf/templates/userInformationHeadline.tpl
com.woltlab.wcf/templates/usersOnlineList.tpl