Skip to content
Snippets Groups Projects
Commit 8319c14e authored by Loraine Gueguen's avatar Loraine Gueguen
Browse files

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
parents 5d746bfe 1c0c49e4
No related branches found
No related tags found
1 merge request!1Merge upstream
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment