Merge branch 'release/1.12.5'

jplusplus · Feb 13, 2015 · ddbe86e · ddbe86e
2 parents e78b8f0 + 95d0b43
commit ddbe86e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@
 [License](https://github.com/jplusplus/detective.io/blob/master/LICENSE) •
 [Test coverage](https://coveralls.io/r/jplusplus/detective.io) •
 [Documentation](http://docs.detective.io/en/latest/) •
-*Version 1.12.4 Gorilla*
+*Version 1.12.5 Gorilla*
 
 ## Installation
 

diff --git a/app/detective/bundle/bower.json b/app/detective/bundle/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "detective",
-  "version": "1.12.4",
+  "version": "1.12.5",
   "dependencies": {
     "angular": "1.2.16",
     "angular-cookies": "1.2.16",

diff --git a/app/detective/bundle/package.json b/app/detective/bundle/package.json
@@ -1,6 +1,6 @@
 {
   "name": "detective",
-  "version": "1.12.4",
+  "version": "1.12.5",
   "dependencies": {
     "bower": "latest",
     "coffee-script": "1.6.2",

diff --git a/docs/conf.py b/docs/conf.py
@@ -58,7 +58,7 @@
 # The short X.Y version.
 version = '1.12'
 # The full version, including alpha/beta/rc tags.
-release = '1.12.4 Gorilla'
+release = '1.12.5 Gorilla'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.