Real-time collaborative document editing https://pad.fuwafuwa.moe

John McLear 8d0d71eddb Merge branch 'develop' of github.com:ether/etherpad-lite into develop ... Conflicts: README.md		2012-11-21 09:10:54 -08:00
bin	Only show errors/warnings on npm install [windows]	2012-11-19 15:24:48 +01:00
doc	Add in docs for L10n	2012-11-14 18:01:01 +01:00
src	Fix #1186 Autodetection wouldn't work correctly in IE9	2012-11-21 17:45:01 +01:00
tests/frontend	Merge pull request #1181 from marcelklehr/fix/lang-test-dont-use-setimeout	2012-11-18 13:09:35 -08:00
tools/doc	Insert epl version into template.	2012-10-27 17:28:15 +02:00
var	Minify and compress JS & CSS before sending it	2011-05-28 18:09:17 +01:00
.gitignore	Ignoring .ep_initialized in git	2012-04-05 20:04:54 +02:00
.travis.yml	encrypted the key again, please travis accept this	2012-11-19 14:52:45 +01:00
CHANGELOG.md	Fix version number in changelog and package.json	2012-11-14 22:02:40 +01:00
CONTRIBUTING.md	Update CONTRIBUTING.md	2012-11-14 19:01:05 +00:00
LICENSE	change copyright holder in license	2012-02-25 09:44:57 +00:00
Makefile	[docs] Fix assets: Rename doc/_assets to doc/assets	2012-10-31 18:12:12 +01:00
settings.json.template	fix #377: add favicon url as optional settings.json parameter	2012-11-04 11:26:17 +01:00
start.bat	Update start.bat	2012-08-01 15:52:12 +02:00