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 2022/01/14 21:26:30 UTC

[airavata-django-portal] 01/01: Merge branch 'staging' 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 d4d9c4de23d7b8ee89350534e109b836d7810424
Merge: 65aaa2d 6d05707
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Fri Jan 14 16:25:40 2022 -0500

    Merge branch 'staging' into develop

 django_airavata/apps/auth/tests/test_backends.py                      | 4 ++--
 .../js/input-editors/InputEditorMixin.js                              | 2 +-
 .../js/components/experiment/input-editors/InputEditorContainer.vue   | 4 ++--
 .../js/components/experiment/input-editors/InputEditorFormGroup.vue   | 2 +-
 django_airavata/static/common/js/components/ValidatedFormGroup.vue    | 2 +-
 django_airavata/static/common/js/errors/ValidationErrors.js           | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)