Merge branch 'hotfix/0.115.6'

CenterForOpenScience · Dec 4, 2017 · 41b1ee8 · 41b1ee8
2 parents 7e2f5a8 + 234d25b
commit 41b1ee8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [0.115.6] - 2017-12-04
+### Changed
+- Update to ember-osf@0.12.4
+
 ## [0.115.5] - 2017-11-29
 ### Changed
 - Update to ember-osf@0.12.3

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "preprint-service",
-  "version": "0.115.5",
+  "version": "0.115.6",
   "description": "Center for Open Science Preprint Service",
   "private": true,
   "directories": {
@@ -30,7 +30,7 @@
   "author": "",
   "license": "Apache-2.0",
   "devDependencies": {
-    "@centerforopenscience/ember-osf": "0.12.3",
+    "@centerforopenscience/ember-osf": "0.12.4",
     "@centerforopenscience/osf-style": "1.5.1",
     "autoprefixer": "6.3.7",
     "broccoli-asset-rev": "2.4.2",

diff --git a/yarn.lock b/yarn.lock
@@ -2,9 +2,9 @@
 # yarn lockfile v1
 
 
-"@centerforopenscience/ember-osf@0.12.3":
-  version "0.12.3"
-  resolved "https://registry.yarnpkg.com/@centerforopenscience/ember-osf/-/ember-osf-0.12.3.tgz#370fe56159e7491f6dc83e076abe8e12ad817852"
+"@centerforopenscience/ember-osf@0.12.4":
+  version "0.12.4"
+  resolved "https://registry.yarnpkg.com/@centerforopenscience/ember-osf/-/ember-osf-0.12.4.tgz#7b178941eb27454998b2c79ea6492a7b3bc5ee21"
   dependencies:
     broccoli-funnel "1.2.0"
     broccoli-merge-trees "2.0.0"