Merge branch '0.15-release-branch' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into 0.15-release-branch
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/c73f6a2a Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/c73f6a2a Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/c73f6a2a Branch: refs/heads/0.15-release-branch Commit: c73f6a2aa84fea2b0e136e8d6759b36b28b1e8f6 Parents: 51269ed 4d57103 Author: Supun Nakandala <[email protected]> Authored: Sat Jul 18 16:20:49 2015 +0530 Committer: Supun Nakandala <[email protected]> Committed: Sat Jul 18 16:20:49 2015 +0530 ---------------------------------------------------------------------- app/config/pga_config.php.template | 5 ----- app/controllers/AccountController.php | 2 +- app/views/home.blade.php | 4 ++-- app/views/resource/edit.blade.php | 12 ++++++------ 4 files changed, 9 insertions(+), 14 deletions(-) ----------------------------------------------------------------------
