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/12/06 18:57:11 UTC

[airavata-django-portal] 01/01: Merge branch 'master' into develop

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 0e64e30f78ee1ed7581547c8ec525def8c33dd3a
Merge: f9ac052 3c5d8c7
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Mon Dec 6 13:56:07 2021 -0500

    Merge branch 'master' into develop

 django_airavata/settings.py | 8 ++++++--
 requirements.txt            | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)