Merge branch 'release/1.2.2'

choccybiccy · May 26, 2015 · cc3a265 · cc3a265
2 parents 1d44f4a + acb6f38
commit cc3a265
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.2.1
+1.2.2
diff --git a/composer.json b/composer.json
@@ -14,7 +14,7 @@
  "guzzlehttp/guzzle": "~5.2"
  },
  "require-dev": {
- "phpunit/phpunit": "4.0.*"
+ "phpunit/phpunit": "4.6.*"
  },
  "autoload": {
  "psr-4": { "Choccybiccy\\": "src/" }