Merge branch 'dev' into 'master' (0f6dbfd3) · Commits · abims / e-infra / tripal_abims · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

T

tripal_abims
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

0f6dbfd3

Commit 0f6dbfd3 authored 3 years ago by Loraine Gueguen

Downloads
- Plain Diff

Merge branch 'dev' into 'master'

Merge upstream

See merge request !1

parents 5d746bfe 2b9d1b04

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

README.md 2 additions, 2 deletions

README.md
template.php 53 additions, 2 deletions

template.php
templates/page--front.tpl.php 56 additions, 13 deletions

templates/page--front.tpl.php
templates/page.tpl.php 55 additions, 12 deletions

templates/page.tpl.php
templates/tripal_feature_alignments.tpl.php 21 additions, 13 deletions

templates/tripal_feature_alignments.tpl.php

with 187 additions and 42 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment