Merge remote-tracking branch 'refs/remotes/origin/next' into next-lantia
authorAlexander Ebert <ebert@woltlab.com>
Wed, 16 Mar 2016 12:03:57 +0000 (13:03 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 16 Mar 2016 12:03:57 +0000 (13:03 +0100)
commitb94c5c8c218752ef79169c3d8e1d5f8f62b122c0
tree76fbd9185d1b30a34ccfaea7fb865e1ca3b013c7
parent27db335a090a81dd256230970f0c88d5e0c0dfb1
parentd2fbf9ba388c39f6fc5c57cc0af154c5dc68ab93
Merge remote-tracking branch 'refs/remotes/origin/next' into next-lantia

# Conflicts:
# wcfsetup/install/files/acp/templates/noticeAdd.tpl
com.woltlab.wcf/templates/userNotice.tpl
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml
wcfsetup/setup/db/install.sql