Merge remote-tracking branch 'sneha/2463' into develop

This closes #62


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

Branch: refs/heads/dreg-gateway
Commit: 06544a1535b994e3a7d602fd66b230a846649fe0
Parents: b6c715d a5cb98a
Author: Marcus Christie <machr...@iu.edu>
Authored: Tue Jul 4 11:41:43 2017 -0400
Committer: Marcus Christie <machr...@iu.edu>
Committed: Tue Jul 4 11:41:43 2017 -0400

----------------------------------------------------------------------
 app/controllers/AdminController.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


Reply via email to