Version bumping and changelog

claudioc · May 22, 2015 · 9141a26 · 9141a26
1 parent 8cb071b
commit 9141a26
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,4 +1,11 @@
-Version 1.2.9, January 26th, 2014
+Version 1.2.11, May 22th, 2015
+=================================
+
+- Merge PR #78 (Local authentication support, by @vschoettke)
+- Merge PR #75 (Gfm line breaks, by @apskim)
+- Deprecated the Alone authentication method
+
+Version 1.2.9, January 26th, 2015
 =================================
 
 - Fixes #64 (crash serving favicon)

diff --git a/jingo b/jingo
@@ -18,7 +18,7 @@ var program = require('commander'),
 
 global.Git = require('./lib/gitmech');
 
-program.version('1.2.10')
+program.version('1.2.11')
        .option('-c, --config <path>', 'Specify the config file')
        .option('-#, --hash-string <string>', 'Create an hash for a string')
        .option('-l, --local', 'Listen on localhost only')

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jingo",
-  "version": "1.2.10",
+  "version": "1.2.11",
   "description": "A nodejs based wiki engine (sort of Gollum port)",
   "author": "Claudio Cicali <claudio.cicali@gmail.com>",
   "keywords": [