Merge branch '3.0'
authorMatthias Schmidt <gravatronics@live.com>
Sun, 19 Nov 2017 09:24:51 +0000 (10:24 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Sun, 19 Nov 2017 09:24:51 +0000 (10:24 +0100)
commit267782e2bcea54ac351ce8c227b35377f370a34f
treee7c8e18342ef251e5973a686988bd20629a67109
parent004e30879a3cb4fae8303a55342e749755a6d206
parenta8cdca5c792dd817d754c701e95204595bc192c1
Merge branch '3.0'

# Conflicts:
# wcfsetup/install/files/acp/templates/boxAdd.tpl
wcfsetup/install/files/acp/templates/boxAdd.tpl