Merge branch 'origin/formBuilder' into reactions
authorJoshua Rüsweg <josh@bastelstu.be>
Mon, 28 May 2018 13:28:56 +0000 (15:28 +0200)
committerJoshua Rüsweg <josh@bastelstu.be>
Mon, 28 May 2018 13:28:56 +0000 (15:28 +0200)
commit000e79e44c247398a5cdb76466b82f81c1fa1a4c
tree19b5a49f413dbf2b1156cedc92683c5d7b0c2165
parent98e163c91ebd9e92b8274824af3d46f644f5d79e
parentbedd6e2af3c8bc954fee813363c9ee317a3fb358
Merge branch 'origin/formBuilder' into reactions
CodeSniff/WCF/ruleset.xml
wcfsetup/install/files/lib/system/language/I18nHandler.class.php
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml