zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-04-24 17:22:35 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix merge conflict

Browse source
This commit is contained in:
Kyle Drake 2019-01-19 03:34:00 -08:00
parent b2e1c8bb61
commit e81d3fed40
1 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
Gemfile.lock
View file

@ -19,7 +19,7 @@ GEM
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.5.2)
addressable (2.6.0)
public_suffix (>= 2.0.2, < 4.0)
annoy (0.5.6)
highline (>= 1.5.0)
@ -43,7 +43,7 @@ GEM
climate_control (0.2.0)
cliver (0.3.2)
coderay (1.1.2)
concurrent-ruby (1.1.3)
concurrent-ruby (1.1.4)
connection_pool (2.2.2)
coveralls (0.8.22)
json (>= 1.8, < 3)
@ -74,20 +74,20 @@ GEM
faraday_middleware (>= 0.9)
loofah (>= 2.0)
sax-machine (>= 1.0)
ffi (1.9.25)
ffi (1.10.0)
filesize (0.2.0)
fspath (3.1.0)
gandi (3.3.27)
hashie
geoip (1.6.4)
hashdiff (0.3.7)
hashdiff (0.3.8)
hashie (3.6.0)
highline (2.0.0)
hiredis (0.6.3)
hoe (3.14.2)
rake (>= 0.8, < 11.0)
htmlentities (4.3.4)
http (4.0.0)
http (4.0.3)
addressable (~> 2.3)
http-cookie (~> 1.0)
http-form_data (~> 2.0)
@ -96,7 +96,7 @@ GEM
domain_name (~> 0.5)
http-form_data (2.1.1)
http_parser.rb (0.6.0)
i18n (1.1.1)
i18n (1.5.2)
concurrent-ruby (~> 1.0)
image_optim (0.26.3)
exifr (~> 1.2, >= 1.2.2)
@ -104,11 +104,11 @@ GEM
image_size (>= 1.5, < 3)
in_threads (~> 1.3)
progress (~> 3.0, >= 3.0.1)
image_optim_pack (0.5.1.20181208)
image_optim_pack (0.5.1.20190105)
fspath (>= 2.1, < 4)
image_optim (~> 0.19)
image_size (2.0.0)
in_threads (1.5.0)
in_threads (1.5.1)
io-extra (1.3.0)
ipaddress (0.8.3)
json (2.1.0)
@ -128,21 +128,21 @@ GEM
mime-types-data (~> 3.2015)
mime-types-data (3.2018.0812)
mini_mime (1.0.1)
mini_portile2 (2.3.0)
mini_portile2 (2.4.0)
minitest (5.11.3)
minitest-reporters (1.3.5)
minitest-reporters (1.3.6)
ansi
builder
minitest (>= 5.0)
ruby-progressbar
mocha (1.7.0)
mocha (1.8.0)
metaclass (~> 0.0.1)
mock_redis (0.19.0)
monetize (1.9.0)
money (~> 6.12)
money (6.13.1)
money (6.13.2)
i18n (>= 0.6.4, <= 2)
msgpack (1.2.4)
msgpack (1.2.6)
multi_json (1.13.1)
multipart-post (2.0.0)
mustermann (1.0.3)
@ -150,15 +150,15 @@ GEM
connection_pool (~> 2.2)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-ssh (5.0.2)
net-ssh (5.1.0)
netrc (0.11.0)
nokogiri (1.8.5)
mini_portile2 (~> 2.3.0)
nokogiri (1.10.1)
mini_portile2 (~> 2.4.0)
nokogumbo (2.0.1)
nokogiri (~> 1.8, >= 1.8.4)
ox (2.10.0)
paypal-recurring (1.1.0)
pg (1.1.3)
pg (1.1.4)
poltergeist (1.18.1)
capybara (>= 2.1, < 4)
cliver (~> 0.3.1)
@ -184,8 +184,8 @@ GEM
rack (>= 1.0.0)
rake (10.5.0)
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
rb-inotify (0.10.0)
ffi (~> 1.0)
redis (3.3.5)
redis-namespace (1.6.0)
redis (>= 3.0.4)
@ -209,13 +209,13 @@ GEM
crass (~> 1.0.2)
nokogiri (>= 1.8.0)
nokogumbo (~> 2.0)
sass (3.7.2)
sass (3.7.3)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
sax-machine (1.3.2)
sequel (5.15.0)
sequel (5.16.0)
sequel_pg (1.11.0)
pg (>= 0.18.0)
sequel (>= 4.38.0)
@ -253,7 +253,7 @@ GEM
sysinfo (0.8.1)
drydock
storable
term-ansicolor (1.7.0)
term-ansicolor (1.7.1)
tins (~> 1.0)
terrapin (0.6.0)
climate_control (>= 0.0.3, < 1.0)
@ -269,7 +269,7 @@ GEM
unf_ext
unf_ext (0.0.7.5)
uuidtools (2.1.5)
webmock (3.4.2)
webmock (3.5.1)
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff
@ -354,10 +354,10 @@ DEPENDENCIES
thread
tilt
timecop
webmock
webmock (= 3.5.1)
will_paginate
xmlrpc
zipruby
BUNDLED WITH
1.16.4
2.0.1