Merge git://github.com/themasch/etherpad-lite into develop

This commit is contained in:
Peter 'Pita' Martischka 2011-08-26 19:06:45 +01:00
commit d23984f028
3 changed files with 10 additions and 0 deletions

View file

@ -76,6 +76,12 @@
<div class="buttonicon" style="background-position:0px -86px"></div>
</a>
</li>
<li class="separator"></li>
<li onClick="window.pad&&pad.editbarClick('tglfont');return false;" >
<a id="monospace" title="toggle the font between monospace and normal">
<div class="buttonicon" style="background-position:0px -436px"></div>
</a>
</li>
</ul>
<ul id="menu_right">