Merge branch 'master' into develop

ncbo · Oct 22, 2024 · 8d3d031 · 8d3d031
2 parents 37deda2 + b5422b1
commit 8d3d031
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/Gemfile b/Gemfile
@@ -41,7 +41,6 @@ gem 'unicorn-worker-killer'
 gem 'haml', '~> 5.2.2' # pin see https://github.com/ncbo/ontologies_api/pull/107
 gem 'redcarpet'
 
-
 # NCBO gems (can be from a local dev path or from rubygems/git)
 gem 'ncbo_annotator', github: 'ncbo/ncbo_annotator', branch: 'develop'
 gem 'ncbo_cron', github: 'ncbo/ncbo_cron', branch: 'develop'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -27,7 +27,7 @@ GIT
 
 GIT
   remote: https://github.com/ncbo/ncbo_cron.git
-  revision: 17b2f2b8522e6b36baa1d003b5e27cb536c04a03
+  revision: 4255106846207d79a41716615bc57a379256212b
   branch: develop
   specs:
     ncbo_cron (0.0.1)
@@ -56,7 +56,7 @@ GIT
 
 GIT
   remote: https://github.com/ncbo/ontologies_linked_data.git
-  revision: 02ffe85324271f7cdf3601d57315ebb54d716309
+  revision: a65341b714f2734c6ad5fd1999c9e1bf03a17585
   branch: develop
   specs:
     ontologies_linked_data (0.0.1)