Merge branch '3.0'
authorMatthias Schmidt <gravatronics@live.com>
Sat, 23 Dec 2017 11:00:22 +0000 (12:00 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Sat, 23 Dec 2017 11:00:22 +0000 (12:00 +0100)
commit628a0867f3c1eeac8a06805786251ead2812dc1b
treea65469d406d83dc7ed2d60a7f81e27f1f7f73cff
parent2023bc185c095056d25918934e90f3d464cad029
parent1c3cae815b5e78b4105105c5fda417943fdd082e
Merge branch '3.0'
com.woltlab.wcf/templates/ampArticle.tpl