You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@airavata.apache.org by ma...@apache.org on 2021/06/24 19:00:08 UTC

[airavata-django-portal-sdk] 01/02: Merge branch 'master' into mft-integration

This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch mft-integration
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal-sdk.git

commit 9fef5256230109a4d14e6ba45d6bae1570843f21
Merge: 45bfff1 b79cd5c
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Thu Jun 24 14:50:30 2021 -0400

    Merge branch 'master' into mft-integration

 .gitignore |   1 +
 LICENSE    | 201 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 setup.py   |   2 +-
 3 files changed, 203 insertions(+), 1 deletion(-)