Merge branch 'webseed'
[oweals/peertube.git] / .gitignore
1 node_modules
2 schemes/
3 certs/
4 logs/
5 test1/
6 test2/
7 test3/
8 test4/
9 test5/
10 test6/
11 public/stylesheets/global.css
12 public/stylesheets/vendor
13 uploads
14 thumbnails
15 config/production.yaml
16 ffmpeg
17 <<<<<<< HEAD
18 torrents
19 =======
20 .tags
21 *.sublime-project
22 *.sublime-workspace
23 torrents/
24 >>>>>>> master