diff options
| author | Marcel Klehr <mklehr@gmx.net> | 2012-12-31 16:33:01 +0100 |
|---|---|---|
| committer | Marcel Klehr <mklehr@gmx.net> | 2012-12-31 16:33:01 +0100 |
| commit | 1d5dbd45ca88ac9b5f025d5f1aae097301a6a234 (patch) | |
| tree | a01750cb378c24ef2c43892d64dc95a1db04119c | |
| parent | b6c9b4ec30520df1fe32fbf63810f9a7310f6e31 (diff) | |
| parent | a42f220ee241a7a38840ee7ed52d122607098248 (diff) | |
| download | etherpad-lite-1d5dbd45ca88ac9b5f025d5f1aae097301a6a234.zip | |
Merge branch 'master' into develop
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | src/package.json | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 31cd7756..8e9404f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 * More translations and better language support. See https://translatewiki.net/wiki/Translating:Etherpad_lite for more details * Add a checkToken Method to the API diff --git a/src/package.json b/src/package.json index 02073ea1..67acd126 100644 --- a/src/package.json +++ b/src/package.json @@ -46,5 +46,5 @@ "engines" : { "node" : ">=0.6.0", "npm" : ">=1.0" }, - "version" : "1.2.2" + "version" : "1.2.3" } |