chore: combine changelogs

alexlafroscia · Jan 29, 2019 · 6962e1c · 6962e1c
1 parent f352456
commit 6962e1c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 17 deletions.
diff --git a/0.1.0 b/0.1.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,15 +3,24 @@
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
 <a name="0.2.0"></a>
-# [0.2.0](https://github.com/alexlafroscia/ember-observable/compare/v0.1.0...v0.2.0) (2019-01-29)
 
+# [0.2.0](https://github.com/alexlafroscia/ember-observable/compare/v0.1.0...v0.2.0) (2019-01-29)
 
 ### Bug Fixes
 
-* remove original source of `subscribe` decorator ([a0d5959](https://github.com/alexlafroscia/ember-observable/commit/a0d5959))
+- remove original source of `subscribe` decorator ([a0d5959](https://github.com/alexlafroscia/ember-observable/commit/a0d5959))
+
+### Features
+
+- add observable source from property changes ([6b66b92](https://github.com/alexlafroscia/ember-observable/commit/6b66b92)), closes [#1](https://github.com/alexlafroscia/ember-observable/issues/1)
+- add utility for getting the first value as a Promise ([f6ac06d](https://github.com/alexlafroscia/ember-observable/commit/f6ac06d)), closes [#3](https://github.com/alexlafroscia/ember-observable/issues/3)
+
+<a name="0.1.0"></a>
 
+# 0.1.0 (2019-01-28)
 
 ### Features
 
-* add observable source from property changes ([6b66b92](https://github.com/alexlafroscia/ember-observable/commit/6b66b92)), closes [#1](https://github.com/alexlafroscia/ember-observable/issues/1)
-* add utility for getting the first value as a Promise ([f6ac06d](https://github.com/alexlafroscia/ember-observable/commit/f6ac06d)), closes [#3](https://github.com/alexlafroscia/ember-observable/issues/3)
+- add decorator for subscribing to an observable ([949039a](https://github.com/alexlafroscia/ember-observable/commit/949039a))
+- add helper subscribes to observable ([f92e65a](https://github.com/alexlafroscia/ember-observable/commit/f92e65a))
+- add route base class for observable models ([29f7c7a](https://github.com/alexlafroscia/ember-observable/commit/29f7c7a))