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

Merge branch 'master' of https://github.com/tony199555/alltube into feature/gettext

Browse source 
Conflicts:
	composer.json
	composer.lock
	templates/index.tpl
	templates/video.tpl
This commit is contained in:
Pierre Rudloff 2017-05-29 19:01:20 +02:00
commit 3fff849ea8
15 changed files with 368 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

3
composer.json
View file

@ -13,7 +13,8 @@
"ptachoire/process-builder-chain": "~1.2.0",
"guzzlehttp/guzzle": "~6.2.0",
"aura/session": "~2.1.0",
"barracudanetworks/archivestream-php": "~1.0.5"
"barracudanetworks/archivestream-php": "~1.0.5",
"smarty-gettext/smarty-gettext": "~1.5.1"
},
"require-dev": {
"symfony/var-dumper": "~3.2.0",