nicolas/laverie_app
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

suite

Browse Source
This commit is contained in:
Nicolas Bally 2021-05-15 15:28:29 +02:00
parent 520b0eca28
commit ed003941f4
1 changed files with 0 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Gemfile.lock
View File

@ -88,7 +88,6 @@ GEM
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
<<<<<<< HEAD
kaminari (1.2.1)
activesupport (>= 4.1.0)
kaminari-actionview (= 1.2.1)
@ -126,34 +125,6 @@ GEM
mini_portile2 (~> 2.4.0)
rack (1.6.13)
rack-test (0.6.3)
=======
json (1.8.2)
kaminari (0.16.1)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
kgio (2.9.2)
libv8 (3.16.14.7)
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.25.1)
mini_portile (0.6.0)
minitest (4.7.5)
multi_json (1.10.1)
mysql2 (0.3.16)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-sftp (2.1.2)
net-ssh (>= 2.6.5)
net-ssh (2.7.0)
net-ssh-gateway (1.2.0)
net-ssh (>= 2.6.5)
nokogiri (1.6.3.1)
mini_portile (= 0.6.0)
polyglot (0.3.5)
rack (1.5.2)
rack-test (0.6.2)
>>>>>>> 3c5d04a5f5490c28273b38fd6fe819f8ed613a83
rack (>= 1.0)
rails (4.2.10)
actionmailer (= 4.2.10)
@ -179,7 +150,6 @@ GEM
activesupport (= 4.2.10)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
<<<<<<< HEAD
raindrops (0.19.1)
rake (13.0.3)
rdoc (6.3.1)
@ -187,16 +157,6 @@ GEM
rmagick (4.2.2)
ruby_parser (3.15.1)
sexp_processor (~> 4.9)
=======
raindrops (0.13.0)
rake (10.3.2)
rdoc (4.1.2)
json (~> 1.4)
ref (1.0.5)
rmagick (2.13.4)
rvm-capistrano (1.5.4)
capistrano (~> 2.15.4)
>>>>>>> 3c5d04a5f5490c28273b38fd6fe819f8ed613a83
sass (3.2.19)
sass-rails (4.0.5)
railties (>= 4.0.0, < 5.0)