Merge branch 'master_gitlab_inria_tripal_bipaa' into merge_upstream
# Conflicts: # template.php # templates/html.tpl.php # templates/page--front.tpl.php # templates/page.tpl.php
No related branches found
No related tags found
Showing
- template.php 49 additions, 1 deletiontemplate.php
- templates/page--front.tpl.php 21 additions, 6 deletionstemplates/page--front.tpl.php
- templates/page.tpl.php 21 additions, 6 deletionstemplates/page.tpl.php
- templates/tripal_feature_alignments.tpl.php 21 additions, 13 deletionstemplates/tripal_feature_alignments.tpl.php
Loading
Please register or sign in to comment