Skip to content

Commit

Permalink
Merge pull request #9 from sul-dlss/patch-party
Browse files Browse the repository at this point in the history
Patch party
  • Loading branch information
Darren Hardy committed Apr 3, 2017
2 parents 7c83acc + 57aac44 commit c8d70f4
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ GEM
rack-test (>= 0.5.4)
xpath (~> 2.0)
cliver (0.3.2)
concurrent-ruby (1.0.4)
concurrent-ruby (1.0.5)
config (1.4.0)
activesupport (>= 3.0)
deep_merge (~> 1.1.1)
Expand Down Expand Up @@ -120,7 +120,7 @@ GEM
activesupport (>= 4.1.0)
honeybadger (2.7.2)
htmlentities (4.3.4)
i18n (0.7.0)
i18n (0.8.1)
is_it_working (1.1.0)
jbuilder (2.6.1)
activesupport (>= 3.0.0, < 5.1)
Expand Down Expand Up @@ -150,7 +150,7 @@ GEM
net-ssh (>= 2.6.5)
net-ssh (2.9.4)
nio4r (1.2.1)
nokogiri (1.7.0.1)
nokogiri (1.7.1)
mini_portile2 (~> 2.1.0)
parser (2.3.3.1)
ast (~> 2.2)
Expand Down Expand Up @@ -258,10 +258,10 @@ GEM
libv8 (~> 3.16.14.15)
ref
thor (0.19.4)
thread_safe (0.3.5)
thread_safe (0.3.6)
tilt (2.0.5)
tins (1.13.0)
tzinfo (1.2.2)
tzinfo (1.2.3)
thread_safe (~> 0.1)
uglifier (3.0.4)
execjs (>= 0.3.0, < 3)
Expand Down Expand Up @@ -318,4 +318,4 @@ DEPENDENCIES
web-console

BUNDLED WITH
1.13.6
1.14.6
File renamed without changes.

0 comments on commit c8d70f4

Please sign in to comment.