X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=.gitignore;h=8cd04eea1ebbf46d6b635fcdf79362974fa92940;hb=3acc50844047a37698f0618fa235c138e386a053;hp=75a8a27864dac866e118cce81dea203ea6e2f371;hpb=288178bf02984c7e6dc69241918b88234a0dcb91;p=github%2FChocobozzz%2FPeerTube.git diff --git a/.gitignore b/.gitignore index 75a8a2786..8cd04eea1 100644 --- a/.gitignore +++ b/.gitignore @@ -9,12 +9,14 @@ /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/ @@ -25,7 +27,7 @@ # IDE /*.sublime-project /*.sublime-workspace -/.idea +/**/.idea /dist /PeerTube.iml