diff --git a/CHANGELOG b/CHANGELOG index bdc88e7d700ca8b46ac518eda43337d8dbd3b2cf..f7a933d4392e41be2162076ba212746da8364d73 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,16 @@ Changelog ========= +1.2.0 +----- + +- Add option for secondary servers in resolv.conf +- Reorganize README: + + Move changelog from README to CHANGELOG + + Move contribution guide to CONTRIBUTING.md + + Reorder README, fix Gemfile missing +- Add Apache 2 license file + 1.1.0 -----