diff options
| author | Chocobozzz <me@florianbigard.com> | 2021-05-27 16:12:41 +0200 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2021-05-27 16:12:41 +0200 |
| commit | 8f608a4cb22ab232cfab20665050764b38bac9c7 (patch) | |
| tree | 6a6785aae79bf5939ad7b7a50a1bd8031268d2b4 /.gitignore | |
| parent | 030ccfce59a8cb8f2fee6ea8dd363ba635c5c5c2 (diff) | |
| parent | c215e627b575d2c4085ccb222f4ca8d0237b7552 (diff) | |
| download | PeerTube-8f608a4cb22ab232cfab20665050764b38bac9c7.tar.gz PeerTube-8f608a4cb22ab232cfab20665050764b38bac9c7.tar.zst PeerTube-8f608a4cb22ab232cfab20665050764b38bac9c7.zip | |
Merge branch 'develop' into shorter-URLs-channels-accounts
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 98f337490..3027b6058 100644 --- a/.gitignore +++ b/.gitignore | |||
| @@ -15,7 +15,7 @@ yarn-error.log | |||
| 15 | /server/tests/fixtures/video_59fps.mp4 | 15 | /server/tests/fixtures/video_59fps.mp4 |
| 16 | 16 | ||
| 17 | # Production | 17 | # Production |
| 18 | /storage/ | 18 | /storage |
| 19 | /config/production.yaml | 19 | /config/production.yaml |
| 20 | /config/local* | 20 | /config/local* |
| 21 | /ffmpeg/ | 21 | /ffmpeg/ |