Merge branch 'next' into reactions
authorJoshua Rüsweg <josh@bastelstu.be>
Mon, 6 Aug 2018 11:50:48 +0000 (13:50 +0200)
committerJoshua Rüsweg <josh@bastelstu.be>
Mon, 6 Aug 2018 11:50:48 +0000 (13:50 +0200)
commitd3729554cc4ec542e6868009c8ce20b359872108
tree72e353c7ab2c64e08584af1cd4b07f2b614cc7a3
parent3aa4cc0b6c638d7dd0edab84a710e559217b504e
parent10eeeb808b153a98049e461358d6a7a2f022f642
Merge branch 'next' into reactions
com.woltlab.wcf/templates/headIncludeJavaScript.tpl
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml
wcfsetup/setup/db/install.sql