Merge branch 'master' into next
authorTim Düsterhus <duesterhus@woltlab.com>
Mon, 27 Jun 2016 13:21:18 +0000 (15:21 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Mon, 27 Jun 2016 13:21:18 +0000 (15:21 +0200)
commit0b74e4e6f0203a1a16a066a3cb1287720dd12240
tree506920a1f8331f794f98af7df3c69f02aa7f7b5f
parenta6139d42f4bf6eadf966e4ba2c2f176df380089f
parent7393cd65897ebb2d3a87b4338ff31411cfe1f244
Merge branch 'master' into next
com.woltlab.wcf/option.xml
wcfsetup/install/files/lib/acp/form/UserMailForm.class.php
wcfsetup/install/files/lib/system/comment/manager/UserProfileCommentManager.class.php
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml