mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-20 23:46:14 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fixed merge conflicts

Browse source
This commit is contained in:
John McLear 2011-12-04 18:55:35 +00:00 • committed by Peter 'Pita' Martischka
parent 3401a7bc11
commit d20dcc7c57
4 changed files with 22 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
static/js/pad_editor.js
View file

@ -89,6 +89,7 @@ var padeditor = (function()
self.ace.setProperty("showsauthorcolors", noColors);
self.ace.setProperty("rtlIsTrue", rtlIsTrue);
},
initViewZoom: function()
{