Merge branch 'release/v1.3.0' into develop

[github/Chocobozzz/PeerTube.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 5f681401919674d49e145d830f834346a8168d4b..8cd04eea1ebbf46d6b635fcdf79362974fa92940 100644 (file)
--- 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