Skip to content

Commit 158cb53

Browse files
committed
Merge branch 'master' into develop
2 parents ed72c58 + acddf34 commit 158cb53

2 files changed

Lines changed: 15 additions & 15 deletions

File tree

Gemfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ gem 'haml', '~> 5.2.2' # pin see https://github.com/ncbo/ontologies_api/pull/107
4343
gem 'redcarpet'
4444

4545
# NCBO gems (can be from a local dev path or from rubygems/git)
46-
gem 'goo', github: 'ncbo/goo', branch: 'develop'
47-
gem 'ncbo_annotator', github: 'ncbo/ncbo_annotator', branch: 'develop'
48-
gem 'ncbo_cron', github: 'ncbo/ncbo_cron', branch: 'develop'
49-
gem 'ncbo_ontology_recommender', github: 'ncbo/ncbo_ontology_recommender', branch: 'develop'
50-
gem 'ontologies_linked_data', github: 'ncbo/ontologies_linked_data', branch: 'develop'
46+
gem 'goo', github: 'ncbo/goo', branch: 'master'
47+
gem 'ncbo_annotator', github: 'ncbo/ncbo_annotator', branch: 'master'
48+
gem 'ncbo_cron', github: 'ncbo/ncbo_cron', branch: 'master'
49+
gem 'ncbo_ontology_recommender', github: 'ncbo/ncbo_ontology_recommender', branch: 'master'
50+
gem 'ontologies_linked_data', github: 'ncbo/ontologies_linked_data', branch: 'master'
5151
gem 'sparql-client', github: 'ncbo/sparql-client', tag: 'v6.3.0'
5252

5353
group :development do

Gemfile.lock

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
GIT
22
remote: https://github.com/ncbo/goo.git
3-
revision: 87a21a76bc61392d0629a19c8a18593f606b52e5
4-
branch: develop
3+
revision: 26c0a69e67ac59778a46caf51202ebd38ccac767
4+
branch: master
55
specs:
66
goo (0.0.2)
77
addressable (~> 2.8)
@@ -16,8 +16,8 @@ GIT
1616

1717
GIT
1818
remote: https://github.com/ncbo/ncbo_annotator.git
19-
revision: 55e8cbfac358b2c40deb0bd963bfe6dee91e8347
20-
branch: develop
19+
revision: 4fb9114b80b99f0a654c7f70aaa96839c74fc615
20+
branch: master
2121
specs:
2222
ncbo_annotator (0.0.1)
2323
goo
@@ -27,8 +27,8 @@ GIT
2727

2828
GIT
2929
remote: https://github.com/ncbo/ncbo_cron.git
30-
revision: 4e8911081560a48850b582495a882b77293d216b
31-
branch: develop
30+
revision: 8d67188e7f21014234359b71bb93a9d1256c320c
31+
branch: master
3232
specs:
3333
ncbo_cron (0.0.1)
3434
dante
@@ -45,8 +45,8 @@ GIT
4545

4646
GIT
4747
remote: https://github.com/ncbo/ncbo_ontology_recommender.git
48-
revision: c508796d80764bf748b51e9f1c33e57ea9f14a1d
49-
branch: develop
48+
revision: c6a18eb7700b23a1a4f1e32ebc94003bf75efe93
49+
branch: master
5050
specs:
5151
ncbo_ontology_recommender (0.0.1)
5252
goo
@@ -56,8 +56,8 @@ GIT
5656

5757
GIT
5858
remote: https://github.com/ncbo/ontologies_linked_data.git
59-
revision: 2bbdfc99780bbff887cf3fe443e569b92d8f642f
60-
branch: develop
59+
revision: 2f22b1b19bd749c5625af798e2ad132f833309cb
60+
branch: master
6161
specs:
6262
ontologies_linked_data (0.0.1)
6363
activesupport

0 commit comments

Comments
 (0)