Merge remote-tracking branch 'origin/develop' 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/415edc50 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/415edc50 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/415edc50 Branch: refs/heads/develop Commit: 415edc50c02b1687def7b619f9681a30ed98d6db Parents: b464102 ec028e8 Author: scnakandala <[email protected]> Authored: Thu Jul 14 03:03:04 2016 -0400 Committer: scnakandala <[email protected]> Committed: Thu Jul 14 03:03:04 2016 -0400 ---------------------------------------------------------------------- app/controllers/AccountController.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
