Merge branch 'szzh' into develop

gitlab v20140424_2
sw 10 years ago
commit 0651bd7c9c

@ -257,7 +257,7 @@ K.options = {
minHeight : 100,
minChangeSize : 50,
zIndex : 811213,
items : [ 'emoticons','code',
items : [ 'emoticons',
'source','plainpaste', 'wordpaste', '|', 'justifyleft', 'justifycenter', 'justifyright', 'insertorderedlist', '|',
'formatblock', 'fontsize', '|', 'forecolor', 'hilitecolor', 'bold',
'italic', 'underline', 'removeformat', '|','imagedirectupload','table', 'link'

Loading…
Cancel
Save