Merge branch 'refs/heads/pr/2008' into next
authorMarcel Werk <burntime@woltlab.com>
Fri, 1 Jul 2016 14:10:39 +0000 (16:10 +0200)
committerMarcel Werk <burntime@woltlab.com>
Fri, 1 Jul 2016 14:10:39 +0000 (16:10 +0200)
commit173e275a1e1686f92ed1bb148ae30819627e5914
treeb8df60e75a5ab38d41bf7929e285fd7a11339a9f
parent43d055d309d4d24f1394c1ef317b5954753c6b67
parentfa1ddb3342ae38ae0aae6814f91574be7387b2d0
Merge branch 'refs/heads/pr/2008' into next

# Conflicts:

# wcfsetup/install/files/lib/system/user/notification/event/UserProfileCommentUserNotificationEvent.class.php
wcfsetup/install/files/lib/system/user/notification/event/UserProfileCommentUserNotificationEvent.class.php