lucas.mathieu/cachet-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '1.2'

Browse Source 
Conflicts:
	Dockerfile
	composer.lock
This commit is contained in:
Graham Campbell
2015-08-07 12:07:46 +01:00
parent b1eb57e573 e8d3c013a1
commit 32de1d512b
12 changed files with 9 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
composer.json
View File

@@ -39,7 +39,6 @@
},
"require-dev": {
"fzaninotto/faker": "^1.5",
"laravel/homestead": "^2.1.5",
"mockery/mockery": "^0.9.4",
"phpunit/phpunit": "^4.7.6"
},