Merge remote-tracking branch 'refs/remotes/origin/master' into next
authorAlexander Ebert <ebert@woltlab.com>
Fri, 4 Mar 2016 12:24:25 +0000 (13:24 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Fri, 4 Mar 2016 12:24:25 +0000 (13:24 +0100)
commiteb90babefa5910ecee018c56027484d2e7782a1c
treedfa1d8891926aa2426b8fff39f277d168e8a9448
parent317a806409b3819587e0821e638d13ea640ab4f2
parentc4336d8255dfa2352df9f7836fc9105222d11971
Merge remote-tracking branch 'refs/remotes/origin/master' into next

# Conflicts:
# com.woltlab.wcf/package.xml
# wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
# wcfsetup/install/files/js/3rdParty/redactor/plugins/wcombined.min.js
# wcfsetup/install/files/js/WCF.Combined.min.js
# wcfsetup/install/files/lib/acp/page/ExceptionLogViewPage.class.php
# wcfsetup/install/files/lib/system/WCF.class.php

# wcfsetup/install/files/lib/system/option/user/UserOptionHandler.class.php
wcfsetup/install/files/js/WCF.ImageViewer.js
wcfsetup/install/files/lib/acp/form/UserSearchForm.class.php
wcfsetup/install/files/lib/data/notice/NoticeAction.class.php
wcfsetup/install/files/lib/page/MultipleLinkPage.class.php
wcfsetup/install/files/lib/system/option/user/UserOptionHandler.class.php
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml