X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=.gitignore;h=8cd04eea1ebbf46d6b635fcdf79362974fa92940;hb=86aafd06f2d124786ea3d10477f356c2e3f85dd6;hp=5f681401919674d49e145d830f834346a8168d4b;hpb=c674185eb26c6711c1b362ff02807ec01637721b;p=github%2FChocobozzz%2FPeerTube.git diff --git a/.gitignore b/.gitignore index 5f6814019..8cd04eea1 100644 --- a/.gitignore +++ b/.gitignore @@ -9,12 +9,15 @@ /test4/ /test5/ /test6/ +/server/tests/fixtures/video_high_bitrate_1080p.mp4 # Production /storage/ /config/production.yaml /config/local* /ffmpeg/ +/ffmpeg-3/ +/ffmpeg-4/ /thumbnails/ /torrents/ /videos/ @@ -24,7 +27,7 @@ # IDE /*.sublime-project /*.sublime-workspace -/.idea +/**/.idea /dist /PeerTube.iml