mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-25 09:56:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge branch 'develop' of github.com:ether/etherpad-lite into focus-on-password

Browse source
This commit is contained in:
John McLear 2012-12-02 17:06:33 +00:00
commit c9a5e55654
33 changed files with 1194 additions and 253 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/templates/pad.html
View file

@ -32,7 +32,7 @@
<meta charset="utf-8">
<meta name="robots" content="noindex, nofollow">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0">
<link rel="shortcut icon" href="<%=settings.favicon%>">
<link rel="shortcut icon" href="<%=settings.faviconPad%>">
<link rel="resource" type="application/l10n" href="../locales.ini" />
<script type="text/javascript">