Skip to content

Commit 6d45b24

Browse files
committed
Merge branch 'develop'
2 parents 9ea0924 + 136e94a commit 6d45b24

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ gem 'rails', '~> 5.0.1'
1212

1313
# Cortex-specific
1414
gem 'cortex-exceptions', '= 0.0.4'
15-
gem 'cortex-plugins-core', '= 0.9.0'
15+
gem 'cortex-plugins-core', '= 0.9.1'
1616

1717
# API
1818
gem 'grape', '~> 0.17'

Gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ GEM
136136
concurrent-ruby (1.0.4)
137137
connection_pool (2.2.1)
138138
cortex-exceptions (0.0.4)
139-
cortex-plugins-core (0.9.0)
139+
cortex-plugins-core (0.9.1)
140140
cells (~> 4.1)
141141
cells-haml (~> 0.0.10)
142142
cells-rails (~> 0.0.6)
@@ -704,7 +704,7 @@ DEPENDENCIES
704704
cells-rails (~> 0.0.6)
705705
codeclimate-test-reporter (~> 0.6)
706706
cortex-exceptions (= 0.0.4)
707-
cortex-plugins-core (= 0.9.0)
707+
cortex-plugins-core (= 0.9.1)
708708
database_cleaner (~> 1.5)
709709
devise (~> 4.2.0)
710710
doorkeeper (~> 4.2)

0 commit comments

Comments
 (0)