Merge branch 'AIRAVATA-2164-remove-user-from-pending-role' of https://github.com/machristie/airavata-php-gateway 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/26ed2cfd Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/26ed2cfd Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/26ed2cfd Branch: refs/heads/develop Commit: 26ed2cfdab6c8a47f807b2a21f52cd7975568868 Parents: 555cf68 f41820e Author: scnakandala <supun.nakand...@gmail.com> Authored: Mon Oct 17 23:54:29 2016 -0400 Committer: scnakandala <supun.nakand...@gmail.com> Committed: Mon Oct 17 23:54:29 2016 -0400 ---------------------------------------------------------------------- app/controllers/AdminController.php | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/26ed2cfd/app/controllers/AdminController.php ----------------------------------------------------------------------
