Merge remote-tracking branch 'origin/next' into reactions
authorJoshua Rüsweg <josh@bastelstu.be>
Sun, 13 May 2018 12:09:19 +0000 (14:09 +0200)
committerJoshua Rüsweg <josh@bastelstu.be>
Sun, 13 May 2018 12:09:19 +0000 (14:09 +0200)
commitb5ebf8aa0ee5985908c7d43cc85a7b81cd08b5c5
tree4045662dec9a51b5a7d7e87e95ec8154c82f37db
parentf082a2ccf5e0cd59e3e3aaa5b88d2f817a1c02c5
parentd86b84d740f60859532fa587178b8d69923d7cf5
Merge remote-tracking branch 'origin/next' into reactions
CodeSniff/WCF/ruleset.xml
com.woltlab.wcf/userGroupOption.xml
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml