Skip to content

Commit 623aefb

Browse files
committed
Merge branch 'release/5.21.0'
2 parents 429d8d1 + 3f87d4e commit 623aefb

11 files changed

Lines changed: 245 additions & 139 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ public/blog/*
2727
public/thumbnails/*
2828
public/uploads/*
2929
public/derivatives/*
30+
public/exports/*
3031

3132
# Ignore public/uploads
3233
public/uploads/*

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ gem 'twitter-typeahead-rails', '0.11.1.pre.corejavascript'
8383
gem 'geoblacklight', '~> 4.0'
8484

8585
# GBL Admin
86-
gem 'geoblacklight_admin', '~> 0.9.0'
87-
# gem 'geoblacklight_admin', git: "https://github.com/geobtaa/geoblacklight_admin.git", branch: "develop"
86+
gem 'geoblacklight_admin', '~> 0.10.0'
87+
# gem 'geoblacklight_admin', git: "https://github.com/geobtaa/geoblacklight_admin.git", branch: "feature/background-distribution-deletes"
8888
gem 'git', ">= 1.13"
8989
gem "rubyzip", ">= 1.3.0"
9090
gem "awesome_print"

0 commit comments

Comments
 (0)