Merge tag '3.1.5' into next
authorTim Düsterhus <duesterhus@woltlab.com>
Thu, 23 Aug 2018 12:16:59 +0000 (14:16 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Thu, 23 Aug 2018 12:16:59 +0000 (14:16 +0200)
commit2ed23910dc94fbf1d10ec2f03e04b252534bb900
treecf4750623c04eeeb448fefb5bc6791784ef0a2e3
parent4eae989cc75a3f028fd6f3b241c8a10313c9e1b3
parent8c5ff798d3922cac1c2901a7ad6eea51512af956
Merge tag '3.1.5' into next
wcfsetup/install/files/acp/templates/bbcodeAdd.tpl
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml