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

This closes #61


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

Branch: refs/heads/dreg-gateway
Commit: 5d992bb5bd6dfc7cc9f1c5226e54294a361dd32b
Parents: 2d8b6d7 36b0501
Author: Marcus Christie <machr...@iu.edu>
Authored: Tue Jul 4 12:33:43 2017 -0400
Committer: Marcus Christie <machr...@iu.edu>
Committed: Tue Jul 4 12:33:43 2017 -0400

----------------------------------------------------------------------
 app/config/email_templates.json     | 16 ++++++++--------
 app/controllers/AdminController.php | 13 +++++--------
 app/libraries/EmailUtilities.php    |  9 ++++-----
 3 files changed, 17 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


Reply via email to