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 2020/07/13 15:31:02 UTC

[airavata-django-portal] 01/01: Merge branch 'AIRAVATA-3347-wagtail-specify-interval-between-images-in-carous'

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

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

commit 0c0959042da406c5de8b7a02c79b471da0661fe0
Merge: 17694cf 27b2667
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Mon Jul 13 11:29:51 2020 -0400

    Merge branch 'AIRAVATA-3347-wagtail-specify-interval-between-images-in-carous'

 django_airavata/static/common/js/cms.js            |  4 --
 .../templates/blocks/bootstrap/carousel.html       |  2 +-
 django_airavata/wagtailapps/base/blocks.py         |  4 ++
 .../base/migrations/0024_auto_20200624_1925.py     | 50 ++++++++++++++++++++++
 4 files changed, 55 insertions(+), 5 deletions(-)