Merge remote-tracking branch 'origin/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/ffe3b4e5 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/ffe3b4e5 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/ffe3b4e5 Branch: refs/heads/master Commit: ffe3b4e53d47f033e3615fe5524b1ee922a5173a Parents: 09a65f9 8ae672d Author: Suresh Marru <sma...@apache.org> Authored: Fri Mar 11 01:59:44 2016 -0500 Committer: Suresh Marru <sma...@apache.org> Committed: Fri Mar 11 01:59:44 2016 -0500 ---------------------------------------------------------------------- .../Model/AppCatalog/GatewayProfile/Types.php | 23 ++++++++++++++++++++ 1 file changed, 23 insertions(+) ----------------------------------------------------------------------
