Commit 5a223e7d authored by Ladislav Pittner's avatar Ladislav Pittner
Browse files

Merge branch 'dev' of github.com:lacopittner/ffmpeg-gui-electron into dev

parents b3409879 45418735
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment