Merge branch '3.0'
authorMatthias Schmidt <gravatronics@live.com>
Mon, 14 Aug 2017 15:14:28 +0000 (17:14 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Mon, 14 Aug 2017 15:14:28 +0000 (17:14 +0200)
commitdf156db7488f309251ac4e793c06dea17c36448f
treea75a8606671829004cd0f8f30a2f86f34af69718
parentee5e817d14d90dc7d1dfd36c0e2fdd48c3e3c954
parentd386d76e066b03badd5f6e2e625cef6b3dbc1f46
Merge branch '3.0'
wcfsetup/install/files/js/WCF.js
wcfsetup/install/files/js/WoltLabSuite/Core/Media/Editor.js
wcfsetup/install/files/lib/data/user/UserProfileAction.class.php