This is an automated email from the ASF dual-hosted git repository. machristie pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git
commit 436e05ada41cda2f3af8b75512d59c05a5f971dc Merge: 5c8005f 99e552e Author: Marcus Christie <[email protected]> AuthorDate: Tue Jul 13 18:02:04 2021 -0400 Merge branch 'staging' into develop .../GroupComputeResourcePreference.vue | 10 +++++----- django_airavata/apps/api/serializers.py | 1 + 2 files changed, 6 insertions(+), 5 deletions(-)
