Merge remote-tracking branch 'refs/remotes/origin/3.0'
authorAlexander Ebert <ebert@woltlab.com>
Mon, 4 Sep 2017 12:53:35 +0000 (14:53 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 4 Sep 2017 12:53:35 +0000 (14:53 +0200)
commit66c0148502d693a279ab2bed994dfd9840093eb0
treeb6f0fb284578339d0d98ec558154549ee0a361b1
parent16f8764b9d76d8c310eeab5872a5fc3260caa780
parentaabbf2aa7505ca63a6ef0365d14c31fec01ed923
Merge remote-tracking branch 'refs/remotes/origin/3.0'
com.woltlab.wcf/templates/wysiwyg.tpl
wcfsetup/install/files/acp/templates/wysiwyg.tpl