Iván Eixarch f9b6d9f122 Merge remote branch 'ether/develop' into develop		2012-12-06 11:22:05 +01:00
..
locales	Merge branch 'develop' of github.com:ether/etherpad-lite into focus-on-password	2012-12-03 11:37:01 +00:00
node	fix for multiple cookies support (Also fix for, when session is not valid anymore)	2012-12-06 02:01:38 +01:00
static	Merge pull request #1255 from 0ip/feature/show-pl-version	2012-12-05 05:09:20 -08:00
templates	Merge remote branch 'ether/develop' into develop	2012-12-06 11:22:05 +01:00
ep.json	merged develop back in	2012-11-13 07:43:48 -08:00
package.json	Update language4translatewiki 0.1.3	2012-12-04 12:12:58 +01:00
web.config	Add IIS config file	2012-10-25 10:22:28 -07:00