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 2018/10/10 15:42:12 UTC

[airavata-django-portal] 03/03: Merge branch 'master' into simccs

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

machristie pushed a commit to branch simccs
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git

commit cc236e9a36948f7f47a51181bf31519f897deabb
Merge: 337b0f5 f62a8c9
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Wed Oct 10 11:32:11 2018 -0400

    Merge branch 'master' into simccs

 .../django_airavata_wagtail_base/includes/announcement_list.html        | 2 ++
 django_airavata/wagtailapps/base/blocks.py                              | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)