johnyma22 1c847dbde3 Merge branch 'develop' of github.com:Pita/etherpad-lite into develop		2012-10-29 22:48:32 +00:00
..
node	Make sure npm is initialized before requiring things (fix #1092)	2012-10-28 18:02:49 +01:00
static	Merge pull request #1098 from Pita/span-two-lines-on-less-than-400px	2012-10-29 15:00:11 -07:00
templates	remove opacity to fix opera bug #941	2012-10-29 22:47:42 +00:00
ep.json	Make the server restart on plugin install	2012-07-03 23:31:44 +02:00
package.json	Mimic, replace or work around removed npm utils.	2012-10-28 18:34:20 +01:00
web.config	Add IIS config file	2012-10-25 10:22:28 -07:00