mirror of
https://github.com/ether/etherpad-lite.git
synced 2025-05-10 00:45:01 -04:00
Merge branch 'develop' of github.com:Pita/etherpad-lite into fixes/focus-on-password-input
This commit is contained in:
commit
ac676c7d39
1 changed files with 2 additions and 2 deletions
|
@ -15,7 +15,7 @@
|
|||
"require-kernel" : "1.0.5",
|
||||
"resolve" : "0.2.x",
|
||||
"socket.io" : "0.9.x",
|
||||
"ueberDB" : "0.1.7",
|
||||
"ueberDB" : "0.1.8",
|
||||
"async" : "0.1.22",
|
||||
"express" : "3.x",
|
||||
"connect" : "2.4.x",
|
||||
|
@ -42,5 +42,5 @@
|
|||
"engines" : { "node" : ">=0.6.0",
|
||||
"npm" : ">=1.0"
|
||||
},
|
||||
"version" : "1.1.2"
|
||||
"version" : "1.1.4"
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue