Merge remote-tracking branch 'origin/next' into next
authorAlexander Ebert <ebert@woltlab.com>
Thu, 23 Jun 2016 13:31:56 +0000 (15:31 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 23 Jun 2016 13:31:56 +0000 (15:31 +0200)
commitcec1c15b86b98d960d9bb9ec258224eb3bb74a64
tree8f0afc8c20c57d17656d37c79fbe26382dbce187
parent2441de4782919d15a6908fb34ce317a095a8c46c
parent46cab4a48c113ae73252d8f9fbca6d84259305f0
Merge remote-tracking branch 'origin/next' into next

# Conflicts:
# com.woltlab.wcf/objectType.xml
com.woltlab.wcf/objectType.xml
com.woltlab.wcf/objectTypeDefinition.xml
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml