merged develop back in

This commit is contained in:
Peter 'Pita' Martischka 2012-11-03 18:16:36 +00:00
commit 6408581adb
19 changed files with 255 additions and 47 deletions

View file

@ -1,7 +1,10 @@
<%
var settings = require("ep_etherpad-lite/node/utils/Settings");
%>
<!doctype html>
<html>
<title>Etherpad Lite</title>
<title><%=settings.title%></title>
<script>
/*
|@licstart The following is the entire license notice for the

View file

@ -3,7 +3,7 @@
%>
<!doctype html>
<html>
<title>Etherpad Lite</title>
<title><%=settings.title%></title>
<script>
/*
|@licstart The following is the entire license notice for the

View file

@ -1,6 +1,9 @@
<%
var settings = require("ep_etherpad-lite/node/utils/Settings");
%>
<!doctype html>
<html lang="en">
<title>Etherpad Lite Timeslider</title>
<title><%=settings.title%> Timeslider</title>
<script>
/*
|@licstart The following is the entire license notice for the