Merge branch 'master' into next
authorJoshua Rüsweg <josh@bastelstu.be>
Sat, 2 Mar 2019 19:40:08 +0000 (20:40 +0100)
committerJoshua Rüsweg <josh@bastelstu.be>
Sat, 2 Mar 2019 19:40:08 +0000 (20:40 +0100)
commit24f34147c3a7fae76bc2a0e89c6f2e7a76a54230
treec25ea03f8afc1ed5851d9ba7e23382af5522e656
parent855cda20b67c6f157aa986796e3d0ed2ff073de2
parent6c6716beec569d3a0faac4be15bacc6cd8a631b5
Merge branch 'master' into next
wcfsetup/install/files/lib/page/TrophyListPage.class.php
wcfsetup/install/files/lib/page/TrophyPage.class.php
wcfsetup/install/files/lib/system/captcha/CaptchaQuestionHandler.class.php