Merge branch '3.0'
authorMatthias Schmidt <gravatronics@live.com>
Sat, 5 Aug 2017 13:56:04 +0000 (15:56 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sat, 5 Aug 2017 13:56:04 +0000 (15:56 +0200)
commit86b76fba7e906a4757348bec375fa33edd66c738
tree55a584477a4d47beb51af9d73e001c6c84f3bf4f
parentbde865af972b9998c8aa5a696a2e9d9addca42d9
parent174a0b52b9004ce5060cc868dc13d6add36bc185
Merge branch '3.0'

# Conflicts:
# wcfsetup/install/files/js/WoltLabSuite/Core/Media/Manager/Search.js
wcfsetup/install/files/js/WoltLabSuite/Core/Media/Manager/Search.js
wcfsetup/install/files/style/ui/media.scss
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml