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