Merge branch 'develop' into feature/stream

Conflicts:
	composer.lock
This commit is contained in:
Pierre Rudloff 2017-01-16 11:06:39 +01:00
commit 8e6c33c260
14 changed files with 288 additions and 64 deletions

View file

@ -1,7 +1,7 @@
{
"name": "alltube",
"description": "HTML GUI for youtube-dl",
"version": "0.7.0",
"version": "0.7.2-beta",
"author": "Pierre Rudloff",
"bugs": "https://github.com/Rudloff/alltube/issues",
"dependencies": {