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

merge develop

Browse source
This commit is contained in:
John McLear 2013-02-25 10:13:50 +00:00
commit f915285f15
23 changed files with 689 additions and 192 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/templates/timeslider.html
View file

@ -40,8 +40,10 @@
<% e.end_block(); %>
<link rel="localizations" type="application/l10n+json" href="../../locales.json" />
<% e.begin_block("timesliderScripts"); %>
<script type="text/javascript" src="../../static/js/html10n.js"></script>
<script type="text/javascript" src="../../static/js/l10n.js"></script>
<% e.end_block(); %>
</head>
<% e.begin_block("timesliderBody"); %>