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

Posted to commits@airavata.apache.org by er...@apache.org on 2020/10/06 17:10:54 UTC

[airavata] 02/03: Merge branch 'master' of github.com:apache/airavata

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

eroma pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata.git

commit 618168c2e619baa61c355967ca309e4057ebc6fd
Merge: e16269b e21b5e1
Author: eroma2014 <er...@gmail.com>
AuthorDate: Mon Oct 5 14:59:31 2020 -0400

    Merge branch 'master' of github.com:apache/airavata

 dev-tools/ansible/roles/django/templates/django-ssl-vhost.conf.j2 | 2 ++
 dev-tools/ansible/roles/django/templates/django-vhost.conf.j2     | 2 ++
 2 files changed, 4 insertions(+)