mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-26 02:16:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

Merge branch 'develop' of git://github.com/Pita/etherpad-lite into body-block

Browse source 
Conflicts:
	src/templates/pad.html
This commit is contained in:
Edy 2012-05-01 11:35:06 +02:00
commit 1329e93639
8 changed files with 11 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/templates/pad.html
View file

@ -201,12 +201,6 @@
<h2>Embed URL</h2>
<input id="embedinput" type="text" value="">
</div>
<br>
<div id="qrcode">
<h2>QR code</h2>
<div id="qr_center"><img id="embedreadonlyqr"></div>
</div>
<% e.end_block(); %>
</div>
<div id="chatthrob"></div>