Merge branch 'master' into next
authorTim Düsterhus <duesterhus@woltlab.com>
Mon, 6 Jun 2016 15:35:30 +0000 (17:35 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Mon, 6 Jun 2016 15:35:30 +0000 (17:35 +0200)
commit09e08ad31b16faa9406507f07905ac899e71bac8
tree032725d50df276054f2e7ab7a647bbe4a8fd9ac7
parentce7c3d483ea91b194d10f3ede89d268f12996254
parent45485eb66871cd7eb5e6a7df1bd1e3808fb1042d
Merge branch 'master' into next
wcfsetup/install/files/lib/data/style/StyleAction.class.php
wcfsetup/install/files/lib/data/style/StyleEditor.class.php