blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-01 12:19:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci

Browse Source 
Conflicts:
	application/models/person/Person_model.php
	ci_hack.php
This commit is contained in:
Paminger
2016-04-10 18:20:43 +02:00
parent 0d91cdd132 1131bff3ec
commit bf0a96f21a
5 changed files with 195 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+5 -5
View File
@@ -8,8 +8,8 @@ documents/
.settings
.project
.buildpath
!tests/codeception.yml
!tests/codeception/api.suite.yml
!tests/codeception/functional.suite.yml
!tests/codeception/acceptance.suite.yml
!/submodules/d3
tests/codeception.yml
tests/codeception/api.suite.yml
tests/codeception/functional.suite.yml
tests/codeception/acceptance.suite.yml
/submodules/d3