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:11:22 UTC
[airavata-django-portal] branch simccs updated (ff22e57 -> 337b0f5)
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a change to branch simccs
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git.
from ff22e57 Merge pull request #15 from gowtham06/simccs
add f46e8ff AIRAVATA-2902 Allow multiple buttons in BootstrapCard block
new 337b0f5 Merge branch 'master' into simccs
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
django_airavata/templates/blocks/bootstrap/button.html | 2 +-
django_airavata/templates/blocks/bootstrap/card.html | 12 +++++++-----
django_airavata/wagtailapps/base/blocks.py | 15 ++++-----------
3 files changed, 12 insertions(+), 17 deletions(-)
[airavata-django-portal] 01/01: Merge branch 'master' into simccs
Posted by ma...@apache.org.
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 337b0f552cdb6d9460e5d84809bac4095ec4f51d
Merge: ff22e57 f46e8ff
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Wed Oct 10 11:00:17 2018 -0400
Merge branch 'master' into simccs
django_airavata/templates/blocks/bootstrap/button.html | 2 +-
django_airavata/templates/blocks/bootstrap/card.html | 12 +++++++-----
django_airavata/wagtailapps/base/blocks.py | 15 ++++-----------
3 files changed, 12 insertions(+), 17 deletions(-)