Skip to content

Commit 3c98794

Browse files
committed
Merge branch 'develop'
2 parents 0541458 + d3f08c0 commit 3c98794

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Diff for: Gemfile

+1-1
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.12.1'
15+
gem 'cortex-plugins-core', '= 0.12.2'
1616

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

Diff for: Gemfile.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ GEM
137137
concurrent-ruby (1.0.4)
138138
connection_pool (2.2.1)
139139
cortex-exceptions (0.0.4)
140-
cortex-plugins-core (0.12.1)
140+
cortex-plugins-core (0.12.2)
141141
cells (~> 4.1)
142142
cells-haml (~> 0.0)
143143
cells-rails (~> 0.0)
@@ -744,7 +744,7 @@ DEPENDENCIES
744744
cells-rails (~> 0.0.7)
745745
codeclimate-test-reporter (~> 0.6)
746746
cortex-exceptions (= 0.0.4)
747-
cortex-plugins-core (= 0.12.1)
747+
cortex-plugins-core (= 0.12.2)
748748
database_cleaner (~> 1.5)
749749
deep_cloneable (~> 2.2.2)
750750
devise (~> 4.2.0)

0 commit comments

Comments
 (0)