From 91a842378d943fb7db6923daec08ef466ed6b7f9 Mon Sep 17 00:00:00 2001
From: Josh Bradley <jbradley@arcticlcc.org>
Date: Mon, 11 Mar 2019 11:55:28 -0700
Subject: [PATCH 1/2] Update yarn.lock

---
 yarn.lock | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index e1951888e..c1d513f3d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2136,11 +2136,16 @@ bootstrap-3-card@^0.2.0:
   dependencies:
     bootstrap-sass "3.x"
 
-bootstrap-sass@3.x, bootstrap-sass@~3.3.7:
+bootstrap-sass@3.x:
   version "3.3.7"
   resolved "https://registry.yarnpkg.com/bootstrap-sass/-/bootstrap-sass-3.3.7.tgz#6596c7ab40f6637393323ab0bc80d064fc630498"
   integrity sha1-ZZbHq0D2Y3OTMjqwvIDQZPxjBJg=
 
+bootstrap-sass@~3.4.1:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/bootstrap-sass/-/bootstrap-sass-3.4.1.tgz#6843c73b1c258a0ac5cb2cc6f6f5285b664a8e9a"
+  integrity sha512-p5rxsK/IyEDQm2CwiHxxUi0MZZtvVFbhWmyMOt4lLkA4bujDA1TGoKT0i1FKIWiugAdP+kK8T5KMDFIKQCLYIA==
+
 bops@0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/bops/-/bops-0.0.3.tgz#c5cbf6fea8be7401ca5ea6d1679e6c4e8b407c79"
@@ -5436,7 +5441,7 @@ entities@~1.1.1:
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
   integrity sha1-blwtClYhtdra7O+AuQ7ftc13cvA=
 
-"eonasdan-bootstrap-datetimepicker@github:btecu/bootstrap-datetimepicker":
+eonasdan-bootstrap-datetimepicker@btecu/bootstrap-datetimepicker:
   version "4.17.47"
   resolved "https://codeload.github.com/btecu/bootstrap-datetimepicker/tar.gz/b949af947aa32490e548bab089893c86cef3d8f1"
 

From 5594426771fe9e110a410593eefdd3263e54ddef Mon Sep 17 00:00:00 2001
From: Josh Bradley <jbradley@arcticlcc.org>
Date: Mon, 11 Mar 2019 11:59:54 -0700
Subject: [PATCH 2/2] Update CHANGELOG

---
 CHANGELOG.md | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2cf5e208d..ce91f90c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,34 @@
 # Change Log
 
-## [v0.6.1](https://github.com/adiwg/mdEditor/tree/v0.6.1)
+## [v0.7.0](https://github.com/adiwg/mdEditor/tree/v0.7.0)
 
+[Full Changelog](https://github.com/adiwg/mdEditor/compare/v0.6.1...v0.7.0)
+
+**Implemented enhancements:**
+
+- Update GCMD keywords to v8.6 [\#265](https://github.com/adiwg/mdEditor/issues/265)
+- Metadata Identifier lacking "Delete" function [\#261](https://github.com/adiwg/mdEditor/issues/261)
+- Use ember-ajax instead of jQuery.ajax [\#238](https://github.com/adiwg/mdEditor/issues/238)
+- Replace ember-pollboy with ember-concurrency  [\#187](https://github.com/adiwg/mdEditor/issues/187)
+
+**Fixed bugs:**
+
+- In process-step template stepSource.value should be stepSource.description [\#291](https://github.com/adiwg/mdEditor/issues/291)
+- Changing 'resourceType' icon [\#252](https://github.com/adiwg/mdEditor/issues/252)
+
+**Closed issues:**
+
+- Upgrade to Ember 3 [\#255](https://github.com/adiwg/mdEditor/issues/255)
+- Migrate bower dependencies to npm or yarn [\#111](https://github.com/adiwg/mdEditor/issues/111)
+- Upgrade to latest ember-leaflet [\#71](https://github.com/adiwg/mdEditor/issues/71)
+- Update to Ember 2.11.1 [\#46](https://github.com/adiwg/mdEditor/issues/46)
+
+**Merged pull requests:**
+
+- Update bootstrap-sass [\#297](https://github.com/adiwg/mdEditor/pull/297) ([jlblcc](https://github.com/jlblcc))
+- maintenance-255-ember3 [\#266](https://github.com/adiwg/mdEditor/pull/266) ([jlblcc](https://github.com/jlblcc))
+
+## [v0.6.1](https://github.com/adiwg/mdEditor/tree/v0.6.1) (2018-11-09)
 [Full Changelog](https://github.com/adiwg/mdEditor/compare/v0.6.0...v0.6.1)
 
 **Implemented enhancements:**
@@ -21,6 +48,7 @@
 
 **Merged pull requests:**
 
+- Update CHANGELOG [\#248](https://github.com/adiwg/mdEditor/pull/248) ([jlblcc](https://github.com/jlblcc))
 - 0.6.1 [\#247](https://github.com/adiwg/mdEditor/pull/247) ([jlblcc](https://github.com/jlblcc))
 
 ## [v0.6.0](https://github.com/adiwg/mdEditor/tree/v0.6.0) (2018-11-05)