David Yip dd28b94cf0 Merge remote-tracking branch 'origin/master' into gs-master		2017-10-26 09:18:27 -05:00
..
audio_transcoder.rb	raise Mastodon::ValidationError if audio file duration is over 60 secs	2017-10-07 16:14:34 -07:00
gif_transcoder.rb	Fix Cocaine::ExitStatusError when upload small non-animated GIF (#5489)	2017-10-26 22:48:35 +09:00
video_transcoder.rb