]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge pull request #4473 from owncloud/texteditor_polishing
authorJörn Friedrich Dreyer <jfd@butonic.de>
Tue, 3 Sep 2013 12:38:59 +0000 (05:38 -0700)
committerJörn Friedrich Dreyer <jfd@butonic.de>
Tue, 3 Sep 2013 12:38:59 +0000 (05:38 -0700)
Texteditor polishing

1  2 
apps/files/templates/index.php
core/js/js.js

Simple merge
diff --cc core/js/js.js
Simple merge