diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-05-04 12:04:55 -0500 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-05-04 12:04:55 -0500 |
| commit | 2058922cc9dc4f622ecd64ebd102f29b0a43a177 (patch) | |
| tree | 89c86321fd30a76e7369b31337fce761642364ee /Gemfile | |
| parent | 1aa25ee0f52a0f9dd045897949be688de0e45bfb (diff) | |
| parent | 54e80bec735bd0329fc4db08d36103d5e80f358e (diff) | |
Merge branch 'merge-upstream' into gs-master
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile index c3f4a62f2..500628ad1 100644 --- a/Gemfile +++ b/Gemfile @@ -19,7 +19,7 @@ gem 'fog-local', '~> 0.5', require: false gem 'fog-openstack', '~> 0.1', require: false gem 'paperclip', '~> 6.0' gem 'paperclip-av-transcoder', '~> 0.6' -gem 'posix-spawn' +gem 'posix-spawn', '~> 0.3' gem 'streamio-ffmpeg', '~> 3.0' gem 'active_model_serializers', '~> 0.10' |