François Boulogne d3ead86db1 Merge branch 'develop' of git://github.com/ether/etherpad-lite ... Conflicts: src/templates/pad.html src/templates/timeslider.html		2012-11-15 20:52:24 +01:00
..
express	Merge branch 'develop' of git://github.com/ether/etherpad-lite	2012-11-15 20:52:24 +01:00
express.js	Differentiate between http server and express app	2012-09-21 17:12:22 +02:00
i18n.js	Move locale detection to the client	2012-11-14 17:01:59 +01:00