airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From machris...@apache.org
Subject [airavata-django-portal] 01/01: Merge branch 'master' into simccs
Date Wed, 10 Oct 2018 15:11:23 GMT
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 <machrist@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(-)


Mime
View raw message