diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:09:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 22:09:55 -0400 |
| commit | 6efaee30b159313a72d0433d562d364ede2f513c (patch) | |
| tree | 18d62573ed68ce653879aa116729be1f37085ae1 /lib/paperclip/video_transcoder.rb | |
| parent | e5566ac6a6462c0a8a6c6c8f2a1171087bd662a4 (diff) | |
| parent | 698fe3686a8e9a76ae21660d7504a229564d4594 (diff) | |
Merge branch 'master' into patch-1
Diffstat (limited to 'lib/paperclip/video_transcoder.rb')
0 files changed, 0 insertions, 0 deletions