diff options
author | sersut <serdar@opscode.com> | 2014-05-23 12:32:56 -0700 |
---|---|---|
committer | sersut <serdar@opscode.com> | 2014-05-23 12:32:56 -0700 |
commit | 3058c02fa5534bd1f15f0602b78ed77a4b48f9f6 (patch) | |
tree | 1412dd0fccb18d3056d61d3b13e676dba858b2ee | |
parent | 9159f6e0810635e7aa824cbe2d27c097cf7e0b8b (diff) | |
download | mixlib-cli-3058c02fa5534bd1f15f0602b78ed77a4b48f9f6.tar.gz |
Remove CONTRIBUTIONS.md and merge it's contents with CHANGELOG.md.
-rw-r--r-- | CHANGELOG.md | 5 | ||||
-rw-r--r-- | CONTRIBUTIONS.md | 7 |
2 files changed, 5 insertions, 7 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index e4ae4d4..db855dd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,4 +2,9 @@ ## Unreleased +* [**C Chamblin**:](https://github.com/chamblin) + Documented CLI arguments. +* [**Kenichi Kamiya**:](https://github.com/kachick) + Fixed ruby-warning "instance variable @{ivar} not initialized". + ## Last Release: 1.4.0 (12/05/2013) diff --git a/CONTRIBUTIONS.md b/CONTRIBUTIONS.md deleted file mode 100644 index e20267a..0000000 --- a/CONTRIBUTIONS.md +++ /dev/null @@ -1,7 +0,0 @@ -<!--- -This file is reset every time a new release is done. The contents of this file are for the currently unreleased version. - -Example Contribution: -* **kalistec**: Improved file resource greatly. ---> -# mixlib-cli Contributions: |