Merge branch 'master' into develop
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/a2366efd Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/a2366efd Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/a2366efd Branch: refs/heads/develop Commit: a2366efd2c2fe9416f7a1850888b0f868e93a5d9 Parents: 1011cf4 ff9a184 Author: Marcus Christie <[email protected]> Authored: Thu Jun 1 16:39:47 2017 -0400 Committer: Marcus Christie <[email protected]> Committed: Thu Jun 1 16:39:47 2017 -0400 ---------------------------------------------------------------------- app/config/app.php | 2 +- app/libraries/Airavata/Model/Dbevent/Types.php | 573 ++++++++++++++++++++ app/libraries/Airavata/Model/Tenant/Types.php | 528 ++++++++++++++++++ 3 files changed, 1102 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
