Merge remote-tracking branch 'origin/next' into reactions
authorJoshua Rüsweg <josh@bastelstu.be>
Fri, 22 Jun 2018 14:19:17 +0000 (16:19 +0200)
committerJoshua Rüsweg <josh@bastelstu.be>
Fri, 22 Jun 2018 14:19:17 +0000 (16:19 +0200)
commit3313c0f4faeae2d66707fe62ae55d8d06ddbaef9
tree4306df81573c320a0062a2590be4d4d56d18ffa2
parent91c72fa83a6d1f5152f9f709c3155b322cc9eee9
parente2e20b7294e45e40ce533c063dd6541e18f49f8c
Merge remote-tracking branch 'origin/next' into reactions
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml
wcfsetup/setup/db/install.sql