Merge branch 'AIRAVATA-2520-bugfix' 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/4adeaa7e Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/4adeaa7e Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/4adeaa7e Branch: refs/heads/develop Commit: 4adeaa7e0202e725f769cf7498770a1cd7fc0db4 Parents: 5a4a9c3 07d3255 Author: Marcus Christie <[email protected]> Authored: Fri Sep 29 16:42:22 2017 -0400 Committer: Marcus Christie <[email protected]> Committed: Fri Sep 29 16:42:22 2017 -0400 ---------------------------------------------------------------------- app/config/pga_config.php.template | 2 +- app/views/experiment/edit.blade.php | 1 - .../partials/experiment-queue-block.blade.php | 69 +++++++++++++++++++- 3 files changed, 67 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
