diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-06-30 10:59:45 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-06-30 10:59:45 +0200 |
| commit | c5495a448cee117a1ed831991375f0c2f6a43594 (patch) | |
| tree | 4832f1b8d985f78073bcdfd68ffbe05d226e44a9 /lib/paperclip/video_transcoder.rb | |
| parent | 98c2d2aa46c2725b360907cf5537338ac6d052ed (diff) | |
| parent | f895bf198470c1d4a0299b454433fdf1c35ee2b0 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'lib/paperclip/video_transcoder.rb')
0 files changed, 0 insertions, 0 deletions