[2/3] airavata-php-gateway git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop

2016-09-22 Thread ndoshi
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/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/58191f67 Tree: http://git-wip-us.apache.org/re

[2/3] airavata-php-gateway git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop

2016-08-27 Thread ndoshi
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/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/3f5ea2f2 Tree: http://git-wip-us.apache.org/re

[2/3] airavata-php-gateway git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop

2016-05-03 Thread ndoshi
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop # Conflicts: # app/libraries/CommonUtilities.php # app/views/admin/manage-notices.blade.php Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo Commit: http://g

[2/3] airavata-php-gateway git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop

2016-04-27 Thread ndoshi
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/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/873aec41 Tree: http://git-wip-us.apache.org/re