Merge remote-tracking branch 'refs/remotes/sneha/develop' into develop

This closes #67


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/c56680aa
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/c56680aa
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/c56680aa

Branch: refs/heads/dreg-gateway
Commit: c56680aab312684da850f9b43ea72474dc059b52
Parents: 5f30245 cf2274a
Author: Marcus Christie <machr...@iu.edu>
Authored: Sun Jul 9 01:22:32 2017 -0500
Committer: Marcus Christie <machr...@iu.edu>
Committed: Sun Jul 9 01:22:32 2017 -0500

----------------------------------------------------------------------
 app/controllers/AdminController.php | 2 +-
 app/libraries/AdminUtilities.php    | 3 ++-
 app/libraries/CommonUtilities.php   | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


Reply via email to