Merge remote-tracking branch 'refs/remotes/origin/3.0'
authorMarcel Werk <burntime@woltlab.com>
Wed, 27 Jun 2018 13:35:03 +0000 (15:35 +0200)
committerMarcel Werk <burntime@woltlab.com>
Wed, 27 Jun 2018 13:35:03 +0000 (15:35 +0200)
commit98ca49b30cd8e4e716cf9369470d8e325a85f465
tree6a2c5ca14a3c316166db26dd2d60b48c2a74eb93
parenta2918fa95d162a9d9a79a23d1a6944d72b5dd8db
parentab13133f34292e4ba2b1c1324c520180d422297b
Merge remote-tracking branch 'refs/remotes/origin/3.0'

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