nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'next-minor' into develop

Browse source
This commit is contained in:
Dennis Schubert 2017-05-21 12:08:16 +02:00
commit 01d1bb10ac
No known key found for this signature in database
GPG key ID: 5A0304BEA7966D7E
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -132,7 +132,7 @@ gem "leaflet-rails", "0.7.7"
# Parsing # Parsing
gem "nokogiri", "1.7.1" gem "nokogiri", "1.7.2"
gem "open_graph_reader", "0.6.2" # also update User-Agent in features/support/webmock.rb gem "open_graph_reader", "0.6.2" # also update User-Agent in features/support/webmock.rb
gem "redcarpet", "3.4.0" gem "redcarpet", "3.4.0"
gem "ruby-oembed", "0.10.1" gem "ruby-oembed", "0.10.1"

4
Gemfile.lock
View file

@ -379,7 +379,7 @@ GEM
naught (1.1.0) naught (1.1.0)
nenv (0.3.0) nenv (0.3.0)
nio4r (2.0.0) nio4r (2.0.0)
nokogiri (1.7.1) nokogiri (1.7.2)
mini_portile2 (~> 2.1.0) mini_portile2 (~> 2.1.0)
notiffany (0.1.1) notiffany (0.1.1)
nenv (~> 0.1) nenv (~> 0.1)
@ -811,7 +811,7 @@ DEPENDENCIES
minitest minitest
mobile-fu (= 1.3.1) mobile-fu (= 1.3.1)
mysql2 (= 0.4.5) mysql2 (= 0.4.5)
nokogiri (= 1.7.1) nokogiri (= 1.7.2)
omniauth (= 1.4.2) omniauth (= 1.4.2)
omniauth-facebook (= 4.0.0) omniauth-facebook (= 4.0.0)
omniauth-tumblr (= 1.2) omniauth-tumblr (= 1.2)