etherpad-lite/src
Marcel Klehr 7b17bd58ae Merge branch 'pr/1756' into develop
Conflicts:
	src/node/handler/SocketIORouter.js
2013-09-29 16:45:12 +02:00
..
locales Localisation updates from http://translatewiki.net. 2013-09-09 18:49:10 +00:00
node Merge branch 'pr/1756' into develop 2013-09-29 16:45:12 +02:00
static Merge pull request #1906 from ether/down-arrow-dont-be-weird 2013-09-28 23:38:45 -07:00
templates make export clearly seperated from import 2013-09-21 16:22:43 +01:00
ep.json Initial work on swagger 2013-03-06 10:10:21 +00:00
package.json repo url as latest npm shows warn if non existant 2013-06-26 20:19:38 +01:00
README.md remove one less warning during install by having a readme placeholder 2013-02-10 03:04:08 +00:00
web.config Add IIS config file 2012-10-25 10:22:28 -07:00

Ignore this file and see the file in the base installation folder