genuineparts/alltube
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into feature/stream

Browse source 
Conflicts:
	composer.json
	composer.lock
	controllers/FrontController.php
This commit is contained in:
Pierre Rudloff 2016-12-26 13:06:55 +01:00
commit 342dad38e6
21 changed files with 713 additions and 366 deletions
Download patch file Download diff file Expand all files Collapse all files

7
package.json
View file

@ -1,13 +1,12 @@
{
"name": "alltube",
"description": "HTML GUI for youtube-dl",
"version": "0.5.2",
"version": "0.7.0",
"author": "Pierre Rudloff",
"bugs": "https://github.com/Rudloff/alltube/issues",
"dependencies": {
"bower": "~1.7.1",
"bower": "~1.8.0",
"grunt": "~1.0.1",
"grunt-cli": "~1.2.0",
"grunt-contrib-cssmin": "~1.0.0",
"grunt-contrib-uglify": "~2.0.0"
},
@ -39,6 +38,6 @@
"url": "https://github.com/Rudloff/alltube.git"
},
"scripts": {
"postinstall": "node node_modules/bower/bin/bower install && node node_modules/grunt-cli/bin/grunt"
"postinstall": "node node_modules/.bin/bower install && node node_modules/.bin/grunt"
}
}