Merge branch 'master' into next
authorTim Düsterhus <duesterhus@woltlab.com>
Mon, 6 Jun 2016 15:28:59 +0000 (17:28 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Mon, 6 Jun 2016 15:28:59 +0000 (17:28 +0200)
commitce7c3d483ea91b194d10f3ede89d268f12996254
tree36df5ff0aa3ba6f95ed6b919187766cad17f47cb
parenteb6a5ff7341fdea777daab8cf2b42bc77069428a
parent0fc20d0e4457d7d527b29d76f410bd485fbd9cf9
Merge branch 'master' into next
wcfsetup/install/files/lib/data/style/StyleAction.class.php
wcfsetup/install/files/lib/data/style/StyleEditor.class.php
wcfsetup/setup/db/install.sql