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

fixed git merge confict

Browse source
This commit is contained in:
Iván Eixarch 2012-12-03 01:39:59 +01:00
commit 657322db91
34 changed files with 1193 additions and 254 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">

2
src/templates/timeslider.html
View file

@ -31,7 +31,7 @@
<head>
<meta charset="utf-8">
<meta name="robots" content="noindex, nofollow">
<link rel="shortcut icon" href="<%=settings.favicon%>">
<link rel="shortcut icon" href="<%=settings.faviconTimeslider%>">
<link rel="resource" type="application/l10n" href="../../locales.ini" />
<script type="text/javascript">