diff options
author | David Yip <yipdw@member.fsf.org> | 2018-02-17 00:02:37 -0600 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2018-02-17 00:02:37 -0600 |
commit | 3d033a468748338b6036cb24bb00ea4e88656ae6 (patch) | |
tree | a1b3bcbe599a9298f4167769ea2c197f7ca596e6 /Gemfile.lock | |
parent | e9052ceaafff786590fb66bee4550878cfb5a0df (diff) | |
parent | c770b503c0e75015f8ba1ca90755b19326b64c3d (diff) |
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
Conflicts: Gemfile config/locales/simple_form.pl.yml
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 99acf91bf..d4ebd0a40 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -550,6 +550,8 @@ GEM net-scp (>= 1.1.2) net-ssh (>= 2.8.0) statsd-ruby (1.2.1) + streamio-ffmpeg (3.0.2) + multi_json (~> 1.8) strong_migrations (0.1.9) activerecord (>= 3.2.0) temple (0.8.0) @@ -712,6 +714,7 @@ DEPENDENCIES simple_form (~> 3.4) simplecov (~> 0.14) sprockets-rails (~> 3.2) + streamio-ffmpeg (~> 3.0) strong_migrations tty-command tty-prompt |