mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-05-12 18:21:32 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 20

Merge remote branch 'upstream/develop'; commit 'd761003588' into favicon-fix-1236

Browse source
This commit is contained in:
Wikinaut 2012-12-01 00:31:29 +01:00
commit cfce503d59
10 changed files with 61 additions and 153 deletions
Download patch file Download diff file Expand all files Collapse all files

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">