Merge branch '3.0'
authorJoshua Rüsweg <josh@bastelstu.be>
Wed, 6 Feb 2019 11:44:21 +0000 (12:44 +0100)
committerJoshua Rüsweg <josh@bastelstu.be>
Wed, 6 Feb 2019 11:44:21 +0000 (12:44 +0100)
commitc296b186b95ba9c3cd642da2ec20be603dfe8bea
tree2707aae77934fa830918c2449d60aea5321d0005
parent592e4d08a0d4e275a316fb899115c1c6258744ed
parentdb536b9b4ad4ceed0835f455c246895e66d95b8d
Merge branch '3.0'
wcfsetup/install/files/lib/acp/form/SmileyAddForm.class.php
wcfsetup/install/files/lib/util/ImageUtil.class.php