Merge branch 'master' into notifications
authorAlexander Ebert <ebert@woltlab.com>
Wed, 18 Jun 2014 10:34:59 +0000 (12:34 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 18 Jun 2014 10:34:59 +0000 (12:34 +0200)
commit45268d7bc6d8e7cfccc80f5dd336b26d57f78924
tree45523f04a74359063c3d1760ecb862b9aaaf858e
parent4341fcab0977f3189431430585aba02cd0ac308d
parent7c6ceed579a9c3c76e2c4fab81cccdf318786d73
Merge branch 'master' into notifications
wcfsetup/install/files/js/WCF.User.js
wcfsetup/install/files/lib/data/user/UserProfile.class.php
wcfsetup/install/files/lib/system/user/notification/UserNotificationHandler.class.php
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml
wcfsetup/setup/db/install.sql