From e3f9936049720e99c61542b4265f84e65624ee3a Mon Sep 17 00:00:00 2001 From: Jakub Juszczak Date: Sun, 21 Aug 2016 14:42:16 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=93=9D=20Update=20CHANGELOG=20to=201.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jakub Juszczak --- CHANGELOG.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c6a79e..bd2f2b8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,11 @@ # Change Log -## [Unreleased](https://github.com/apertureless/vue-chartjs/tree/HEAD) +## [1.1.0](https://github.com/apertureless/vue-chartjs/tree/1.1.0) (2016-08-21) +[Full Changelog](https://github.com/apertureless/vue-chartjs/compare/1.0.3...1.1.0) -[Full Changelog](https://github.com/apertureless/vue-chartjs/compare/1.0.3...HEAD) +**Implemented enhancements:** + +- Use Vue.util.mergeOptions to merge default options with user's options [\#5](https://github.com/apertureless/vue-chartjs/issues/5) **Merged pull requests:**