Merge branch '2.1'
authorMatthias Schmidt <gravatronics@live.com>
Sat, 22 Oct 2016 07:07:22 +0000 (09:07 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sat, 22 Oct 2016 07:07:22 +0000 (09:07 +0200)
commit27bcf252d845b0dfb7f8dc4444c52939b143289e
tree8fcfcbe4066aa41a8f6758cf72726ba7c62d6cad
parent7a85414444ecc36c09f88a4cec9289a9bf891ee5
parentfa58bdcdb04995efcefe2cb18f835210a107fcdd
Merge branch '2.1'

# Conflicts:
# com.woltlab.wcf/package.xml
# wcfsetup/install/files/lib/form/AbstractModerationForm.class.php
# wcfsetup/install/files/lib/system/WCF.class.php
wcfsetup/install/files/lib/form/AbstractModerationForm.class.php