blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-24 10:22:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge origin/ci into ci

Browse Source 
Conflicts:
	application/config/config.php
	tests/codeception/_data/dump.sql
	tests/codeception/api/v1/PersonCept.php
This commit is contained in:
paolo
2016-04-27 11:54:20 +02:00
parent 51774021b4
commit 549b0133c2
8 changed files with 577 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
phpci.yml
+2 -2
View File
@@ -11,8 +11,8 @@ build_settings:
user: 'fhcomplete'
pass: 'fhcomplete'
setup:
shell:
- "pkill -f fhctest &"
# shell:
# - "pkill -f fhctest &"
composer:
directory: ""
action: "install"