Merge branch '2.0'
authorAlexander Ebert <ebert@woltlab.com>
Sun, 16 Aug 2015 10:10:03 +0000 (12:10 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sun, 16 Aug 2015 10:10:03 +0000 (12:10 +0200)
commitcbdf7a5b5ab11a9b1398965b90c4c1caf438a0a3
treec0d7c7f876861b9611f2d911a3c5c4911c038dcd
parent50e8cce41f0b7447a67400230db1a7fe5d21e875
parent31484d8633dee02ba4eff0adcf16bcd4e3842cd3
Merge branch '2.0'
com.woltlab.wcf/templates/settings.tpl