summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorStefan <stefan@stefans-entwicklerecke.de>2015-04-11 10:55:26 +0200
committerStefan <stefan@stefans-entwicklerecke.de>2015-04-11 10:55:26 +0200
commita69b2a9cd18f8817b05e4fef26ae980a165e1319 (patch)
treee43cab738db530b9edaa5fb6e7ea78098990a509 /src
parentacc1a0626a71fa78d9e743abe3188dd9bc91cf9f (diff)
parentcc34f4e325830f798321b8152095c4dccd6b465f (diff)
downloadetherpad-lite-a69b2a9cd18f8817b05e4fef26ae980a165e1319.zip
Merge pull request #2596 from ether/master
Master
Diffstat (limited to 'src')
-rw-r--r--src/package.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/package.json b/src/package.json
index 84cbeee8..fae55765 100644
--- a/src/package.json
+++ b/src/package.json
@@ -55,5 +55,5 @@
"repository" : { "type" : "git",
"url" : "http://github.com/ether/etherpad-lite.git"
},
- "version" : "1.5.3"
+ "version" : "1.5.4"
}