mirror of
				https://github.com/ether/etherpad-lite.git
				synced 2025-10-31 16:21:11 +01:00 
			
		
		
		
	Merge branch 'develop' of github.com:Pita/etherpad-lite into feature/i18n
This commit is contained in:
		
						commit
						2657f06887
					
				| @ -17,7 +17,7 @@ | ||||
|                       "resolve"             : "0.2.x", | ||||
|                       "socket.io"           : "0.9.x", | ||||
|                       "ueberDB"             : "0.1.8", | ||||
|                       "async"               : "0.1.22", | ||||
|                       "async"               : "0.1.x", | ||||
|                       "express"             : "3.x", | ||||
|                       "connect"             : "2.4.x", | ||||
|                       "clean-css"           : "0.3.2", | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user