Resolving conflicts

This commit is contained in:
jennylee
2015-03-26 18:14:51 -04:00
parent cff0e2c6e1
commit f6788b35d5
15 changed files with 4253 additions and 3231 deletions

View File

@@ -103,3 +103,9 @@ debug = 1
[alias: consolidated]
list = "ProcessMaker\Services\Api\Consolidated"
[alias: dashboard]
dashboard = "ProcessMaker\Services\Api\Dashboard"
[alias: catalog]
dashboard = "ProcessMaker\Services\Api\Catalog"