merge develop

This commit is contained in:
John McLear 2013-03-20 01:11:27 +00:00
commit 4ea7ccd104
60 changed files with 6957 additions and 232 deletions

View file

@ -0,0 +1,29 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>About this folder - Etherpad Lite v1.2.81 Manual &amp; Documentation</title>
<link rel="stylesheet" href="assets/style.css">
</head>
<body class="apidoc" id="api-section-README">
<header id="header">
<h1>Etherpad-Lite v1.2.81 Manual &amp; Documentation</h1>
</header>
<div id="toc">
<h2>Table of Contents</h2>
<ul>
<li><a href="#readme_about_this_folder">About this folder</a></li>
</ul>
</div>
<div id="apicontent">
<h1>About this folder<span><a class="mark" href="#readme_about_this_folder" id="readme_about_this_folder">#</a></span></h1>
<p>We put all documentations we found about the old Etherpad together in this folder. Most of this is still valid for Etherpad Lite</p>
</div>
</body>
</html>