Merge branch 'release/releases-1.2.6' into develop

2013-01-20 13:46:11 +00:00 · 2013-01-20 13:46:11 +00:00 · 4204bf9009
commit 4204bf9009
parent 280359a36d 4b5d993f0d
2 changed files with 5 additions and 1 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,3 +1,7 @@
+# 1.2.6
+ * Fix: Package file UeberDB reference
+ * New #users EEJS block for plugins
+
 # 1.2.5
 * Create timeslider EEJS blocks for plugins
 * Allow for "more messages" to be loaded in chat
--- a/src/package.json
+++ b/src/package.json
@ -46,5 +46,5 @@
  "engines"        : { "node" : ">=0.6.0",
                       "npm"  : ">=1.0"
                     }, 
-  "version"        : "1.2.5"
+  "version"        : "1.2.6"
 }