Merge pull request #1514 from CachetHQ/version

Bumped version to target 2.2
This commit is contained in:
Graham Campbell
2016-02-17 17:34:13 +00:00
3 changed files with 4 additions and 4 deletions

View File

@@ -1 +1 @@
2.1.2-dev
2.2.0-dev

View File

@@ -99,7 +99,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "2.1-dev"
"dev-master": "2.2-dev"
}
},
"minimum-stability": "dev",

4
composer.lock generated
View File

@@ -4,8 +4,8 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"hash": "27d40735fd027c42e2e4c7e6548add8c",
"content-hash": "26fcebcc03ef56202fa94ec1c96c63fa",
"hash": "eff2274253ab51116e07919bed3faeea",
"content-hash": "bedffab57d15b9f3c3315439a2e957cb",
"packages": [
{
"name": "alt-three/bus",