forks/peertube
1
0
Fork 0
Code Releases Activity

Merge branch 'master' into webseed-merged

Browse source
This commit is contained in:
Chocobozzz 2016-10-02 15:39:09 +02:00
commit a6375e6966
186 changed files with 5711 additions and 2542 deletions
Download patch file Download diff file Expand all files Collapse all files

7
.gitignore vendored
View file

@ -14,4 +14,11 @@ uploads
thumbnails
config/production.yaml
ffmpeg
<<<<<<< HEAD
torrents
=======
.tags
*.sublime-project
*.sublime-workspace
torrents/
>>>>>>> master