Merge branch '3.0'
authorMatthias Schmidt <gravatronics@live.com>
Sat, 5 Aug 2017 11:38:49 +0000 (13:38 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sat, 5 Aug 2017 11:38:49 +0000 (13:38 +0200)
commita7a01ea254cccd6654f16fca4f652144c5c9ef88
tree3ac675dc7d05dcff8fa0f3adc57a4994913a9767
parent394d6605b8469ee0b7a9ac5859cd199678964c69
parent8fe2f18754440d7e7aad0e002526b518b47423de
Merge branch '3.0'

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