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.lock
This commit is contained in:
Pierre Rudloff 2016-10-13 17:07:00 +02:00
commit 6e73398369
11 changed files with 163 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

2
composer.json
View file

@ -19,7 +19,7 @@
},
"require-dev": {
"symfony/var-dumper": "~3.1.0",
"squizlabs/php_codesniffer": "~2.6.2",
"squizlabs/php_codesniffer": "~2.7.0",
"phpunit/phpunit": "~5.5.2"
},
"extra": {