Merge remote-tracking branch 'refs/remotes/origin/3.0'
authorMarcel Werk <burntime@woltlab.com>
Thu, 12 Apr 2018 10:50:50 +0000 (12:50 +0200)
committerMarcel Werk <burntime@woltlab.com>
Thu, 12 Apr 2018 10:50:50 +0000 (12:50 +0200)
commit001e6afa4683c0f61a1613c34ebe3f4635052bea
tree8e141d17190c56e3a955f4d6fb035cc50d79bb57
parenta7d39b16669ed8be03183e3d653db4c9139f6fc3
parent54fae1c2a0b0e00e0b0a4236a9949667e1c9cbb1
Merge remote-tracking branch 'refs/remotes/origin/3.0'

# Conflicts:
# com.woltlab.wcf/userGroupOption.xml
com.woltlab.wcf/userGroupOption.xml