tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tootsuite/master' into merge-upstream

Browse Source 
Conflicts:
	Gemfile
	config/locales/simple_form.pl.yml
This commit is contained in:
David Yip
2018-02-17 00:02:37 -06:00
parent e9052ceaaf c770b503c0
commit 3d033a4687
23 changed files with 353 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Gemfile.lock
View File

@ -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