Merge branch 'master' into next
authorAlexander Ebert <ebert@woltlab.com>
Tue, 7 Jul 2015 12:09:16 +0000 (14:09 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 7 Jul 2015 12:09:16 +0000 (14:09 +0200)
commit488643bc27bbf802ecddabdec0e2b2a05d16df34
treeff84851bb04f2e2452f91d163fae465d04a48d19
parent6032b6a77bb976f5f7422fa5c4887a955ea46b38
parent09bd80f4d0a2a48613a5166d49dca021bddb2c3e
Merge branch 'master' into next

Conflicts:
wcfsetup/install/files/js/3rdParty/redactor/plugins/wcombined.min.js
wcfsetup/install/files/js/WCF.Combined.min.js