Merge origin/ci into ci

This commit is contained in:
paolo
2016-05-20 11:05:12 +02:00
6 changed files with 9 additions and 6 deletions
@@ -12,7 +12,7 @@ modules:
- Db
config:
PhpBrowser:
url: 'http://admin:1q2w3@localhost/build/'
url: 'http://admin:1q2w3@localhost/build/fhcomplete/'
Db:
dsn: 'pgsql:host=localhost;port=5432;dbname=fhctest'
user: 'fhcomplete'
+1 -1
View File
@@ -5,7 +5,7 @@ modules:
- Db
- REST:
# API URL
url: http://localhost/build/index.ci.php/api/
url: http://localhost/build/fhcomplete/index.ci.php/api/
# Can also be a framework module name
depends: PhpBrowser
# Limits PhpBrowser to JSON or XML