mirror of
				https://github.com/ether/etherpad-lite.git
				synced 2025-11-04 02:01:30 +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",
 | 
					                      "resolve"             : "0.2.x",
 | 
				
			||||||
                      "socket.io"           : "0.9.x",
 | 
					                      "socket.io"           : "0.9.x",
 | 
				
			||||||
                      "ueberDB"             : "0.1.8",
 | 
					                      "ueberDB"             : "0.1.8",
 | 
				
			||||||
                      "async"               : "0.1.22",
 | 
					                      "async"               : "0.1.x",
 | 
				
			||||||
                      "express"             : "3.x",
 | 
					                      "express"             : "3.x",
 | 
				
			||||||
                      "connect"             : "2.4.x",
 | 
					                      "connect"             : "2.4.x",
 | 
				
			||||||
                      "clean-css"           : "0.3.2",
 | 
					                      "clean-css"           : "0.3.2",
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user