Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/stable' into pkgr
Browse files Browse the repository at this point in the history
  • Loading branch information
crohr committed Dec 19, 2016
2 parents 8e0466e + 9db22bf commit fc06b32
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,8 @@ GEM
omniauth-twitter (1.2.1)
json (~> 1.3)
omniauth-oauth (~> 1.1)
onebox (1.5.44)
onebox (1.6.7)
fast_blank (>= 1.0.0)
htmlentities (~> 4.3.4)
moneta (~> 0.8)
multi_json (~> 1.11)
Expand Down

0 comments on commit fc06b32

Please sign in to comment.