Merge remote-tracking branch 'refs/remotes/origin/2.0' into 2.1
authorMarcel Werk <burntime@woltlab.com>
Sat, 8 Apr 2017 11:56:15 +0000 (13:56 +0200)
committerMarcel Werk <burntime@woltlab.com>
Sat, 8 Apr 2017 11:56:15 +0000 (13:56 +0200)
commitcf9557fee192f5a944f88c78b7d186b2cfa4bfa2
treef1e18b87257e85113652e0757f5a3ff4cb73d343
parentf7784f59deffe895946c7b28d28bcd2d43c2924f
parentf1a2cc9b279f9f0f4982c9aece843ab654b5cc19
Merge remote-tracking branch 'refs/remotes/origin/2.0' into 2.1
com.woltlab.wcf/templates/register.tpl