Merge branch '3.1' into 5.2
authorAlexander Ebert <ebert@woltlab.com>
Fri, 21 Jan 2022 12:27:41 +0000 (13:27 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Fri, 21 Jan 2022 12:27:41 +0000 (13:27 +0100)
commit77593308a76e9b127ba1231bd13b8d8e49bf618f
treea014fe1556bd52799db1ac1e680409f5a99487a5
parent40d2d011154c324cf5c6ee38268d7aadee5b01a8
parent2d9f003a431ec37910a2e74d85fb0a0585bcbd8b
Merge branch '3.1' into 5.2
com.woltlab.wcf/templates/ampArticle.tpl