Merge remote-tracking branch 'refs/remotes/sneha/develop' into develop This closes #66
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/1a7d8405 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/1a7d8405 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/1a7d8405 Branch: refs/heads/dreg-gateway Commit: 1a7d840522ca4a2bdbea8bc2cfdb037fe4b107a2 Parents: 14ee6e5 77914bc Author: Marcus Christie <machr...@iu.edu> Authored: Thu Jul 6 18:11:09 2017 -0400 Committer: Marcus Christie <machr...@iu.edu> Committed: Thu Jul 6 18:11:09 2017 -0400 ---------------------------------------------------------------------- app/controllers/AdminController.php | 2 -- 1 file changed, 2 deletions(-) ----------------------------------------------------------------------
