Merge branch 'master' into next
authorTim Düsterhus <duesterhus@woltlab.com>
Sun, 23 Apr 2017 14:28:06 +0000 (16:28 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Sun, 23 Apr 2017 14:28:06 +0000 (16:28 +0200)
commitd7b10781d6478611b8e731408a5efc89f87d2ca0
tree2058e99fde8671558fda698ec0f1d82adebaa58a
parent2117b730b48c28d56ab0df3fa56f0ab7031189f9
parent2d26ee154305c4027e437906db920f1c1f8c76ad
Merge branch 'master' into next
com.woltlab.wcf/templates/messageSidebar.tpl
com.woltlab.wcf/templates/register.tpl
wcfsetup/install/files/lib/acp/form/PageEditForm.class.php
wcfsetup/install/files/lib/action/TwitterAuthAction.class.php
wcfsetup/install/files/lib/data/comment/CommentAction.class.php
wcfsetup/install/files/lib/data/user/UserProfile.class.php
wcfsetup/install/lang/en.xml