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/03 21:59:22 UTC

[airavata-django-portal] 01/02: Merge branch 'airavata-3465' 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 3f081003b87d2532465a63303599da34665463c9
Merge: 911a0f7 3a8b585
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Thu Jun 3 17:58:48 2021 -0400

    Merge branch 'airavata-3465' into develop

 django_airavata/settings.py                                      | 2 +-
 django_airavata/templates/blocks/heading_block.html              | 8 ++++----
 django_airavata/wagtailapps/base/templatetags/navigation_tags.py | 4 ++--
 requirements.txt                                                 | 7 ++++---
 4 files changed, 11 insertions(+), 10 deletions(-)