mirror of
https://github.com/ether/etherpad-lite.git
synced 2025-04-27 19:06:15 -04:00
Fixed merge conflicts + changed the design of the front page a bit
This commit is contained in:
commit
ba677c6e30
5 changed files with 190 additions and 122 deletions
|
@ -1,18 +1,15 @@
|
|||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
|
||||
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
|
||||
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
|
||||
<!doctype html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
|
||||
<meta http-equiv="Content-Language" content="en-us" />
|
||||
<meta name="ROBOTS" content="NOINDEX, NOFOLLOW" />
|
||||
<meta charset="utf-8">
|
||||
<meta name="robots" content="noindex, nofollow">
|
||||
|
||||
<title>Etherpad Lite Timeslider</title>
|
||||
<link href="../../static/css/pad.css" rel="stylesheet" type="text/css" />
|
||||
<link href="../../static/css/timeslider.css" rel="stylesheet" type="text/css" />
|
||||
<link rel="stylesheet" href="../../static/css/pad.css">
|
||||
<link rel="stylesheet" href="../../static/css/timeslider.css">
|
||||
<style type="text/css" title="dynamicsyntax"></style>
|
||||
<script type="text/javascript" src="../../static/js/jquery.min.js"></script>
|
||||
<script type="text/javascript">
|
||||
<script src="../../static/js/jquery.min.js"></script>
|
||||
<script>
|
||||
// <![CDATA[
|
||||
var clientVars = {};
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue