diff options
| author | Chocobozzz <florian.bigard@gmail.com> | 2016-10-02 15:39:09 +0200 |
|---|---|---|
| committer | Chocobozzz <florian.bigard@gmail.com> | 2016-10-02 15:39:09 +0200 |
| commit | a6375e69668ea42e19531c6bc68dcd37f3f7cbd7 (patch) | |
| tree | 03204a408d56311692c3528bedcf95d2455e94f2 /.gitignore | |
| parent | 052937db8a8d282eccdbdf38d487ed8d85d3c0a7 (diff) | |
| parent | c4403b29ad4db097af528a7f04eea07e0ed320d0 (diff) | |
| download | PeerTube-a6375e69668ea42e19531c6bc68dcd37f3f7cbd7.tar.gz PeerTube-a6375e69668ea42e19531c6bc68dcd37f3f7cbd7.tar.zst PeerTube-a6375e69668ea42e19531c6bc68dcd37f3f7cbd7.zip | |
Merge branch 'master' into webseed-merged
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index ec5b4b2f0..7ca89dca8 100644 --- a/.gitignore +++ b/.gitignore | |||
| @@ -14,4 +14,11 @@ uploads | |||
| 14 | thumbnails | 14 | thumbnails |
| 15 | config/production.yaml | 15 | config/production.yaml |
| 16 | ffmpeg | 16 | ffmpeg |
| 17 | <<<<<<< HEAD | ||
| 17 | torrents | 18 | torrents |
| 19 | ======= | ||
| 20 | .tags | ||
| 21 | *.sublime-project | ||
| 22 | *.sublime-workspace | ||
| 23 | torrents/ | ||
| 24 | >>>>>>> master | ||