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

Merge branch 'stable' into develop

Browse source
This commit is contained in:
Jonne Haß 2015-05-17 20:44:53 +02:00
commit b5e277384b
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

@ -130,7 +130,7 @@ gem "redcarpet", "3.2.3"
gem "twitter-text", "1.12.0" gem "twitter-text", "1.12.0"
gem "roxml", "3.1.6" gem "roxml", "3.1.6"
gem "ruby-oembed", "0.8.14" gem "ruby-oembed", "0.8.14"
gem "open_graph_reader", "0.6.0" gem "open_graph_reader", "0.6.1"
# Services # Services

4
Gemfile.lock
View file

@ -443,7 +443,7 @@ GEM
omniauth-oauth (~> 1.0) omniauth-oauth (~> 1.0)
omniauth-wordpress (0.2.1) omniauth-wordpress (0.2.1)
omniauth-oauth2 (~> 1.1.0) omniauth-oauth2 (~> 1.1.0)
open_graph_reader (0.6.0) open_graph_reader (0.6.1)
faraday (~> 0.9.0) faraday (~> 0.9.0)
nokogiri (~> 1.6) nokogiri (~> 1.6)
orm_adapter (0.5.0) orm_adapter (0.5.0)
@ -767,7 +767,7 @@ DEPENDENCIES
omniauth-tumblr (= 1.1) omniauth-tumblr (= 1.1)
omniauth-twitter (= 1.0.1) omniauth-twitter (= 1.0.1)
omniauth-wordpress (= 0.2.1) omniauth-wordpress (= 0.2.1)
open_graph_reader (= 0.6.0) open_graph_reader (= 0.6.1)
pry pry
pry-byebug pry-byebug
pry-debundle pry-debundle