Skip to content

Commit

Permalink
Merge branch 'release/2.2.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
mblaschke committed Aug 19, 2015
2 parents 5a347fc + 11d7963 commit c318d9d
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
CliTools Changelog
==================

2.2.0 - UPCOMING VERSION
2.2.0 - 2015-08-19
------------------
- Introduced `docker:up --switch` (`docker:up` without --switch parameter no longer shutdown previous one)
- Reverted to old `sync` method (`--files-from` instead of `--include-from`)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# CliTools for Docker, PHP und MySQL development

[![latest v2.1.5](https://img.shields.io/badge/latest-v2.1.5-green.svg?style=flat)](https://github.com/webdevops/clitools/releases/tag/2.1.5)
[![latest v2.2.0](https://img.shields.io/badge/latest-v2.2.0-green.svg?style=flat)](https://github.com/webdevops/clitools/releases/tag/2.2.0)
[![License GPL3](https://img.shields.io/badge/license-GPL3-blue.svg?style=flat)](/LICENSE)
[![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/webdevops/clitools.svg)](http://isitmaintained.com/project/webdevops/clitools "Average time to resolve an issue")
[![Percentage of issues still open](http://isitmaintained.com/badge/open/webdevops/clitools.svg)](http://isitmaintained.com/project/webdevops/clitools "Percentage of issues still open")
Expand Down
2 changes: 1 addition & 1 deletion src/command.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*/

error_reporting(E_ALL);
define('CLITOOLS_COMMAND_VERSION', '2.1.5');
define('CLITOOLS_COMMAND_VERSION', '2.2.0');
define('CLITOOLS_ROOT_FS', __DIR__);

require __DIR__ . '/vendor/autoload.php';
Expand Down

0 comments on commit c318d9d

Please sign in to comment.