mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-11-04 02:01:30 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Marcel Klehr 2012-12-31 16:33:01 +01:00
commit 1d5dbd45ca
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -1,3 +1,7 @@
# 1.2.3
* Fix #1307: Chrome needs console.log to be called on console obj
* Fix #1309: We had broken support for node v0.6 in the last release
# 1.2.2 # 1.2.2
* More translations and better language support. See https://translatewiki.net/wiki/Translating:Etherpad_lite for more details * More translations and better language support. See https://translatewiki.net/wiki/Translating:Etherpad_lite for more details
* Add a checkToken Method to the API * Add a checkToken Method to the API

2
src/package.json
View File

@ -46,5 +46,5 @@
"engines" : { "node" : ">=0.6.0", "engines" : { "node" : ">=0.6.0",
"npm" : ">=1.0" "npm" : ">=1.0"
}, },
"version" : "1.2.2" "version" : "1.2.3"
} }