Skip to content
Snippets Groups Projects
Commit ef9275d0 authored by Alexandre SPANGARO's avatar Alexandre SPANGARO
Browse files

Merge remote-tracking branch 'uptream/develop' into 6.0-multijournal

# Conflicts:
#	htdocs/core/menus/standard/eldy.lib.php
parents 90c1a384 344263f5
No related branches found
No related tags found
No related merge requests found
Showing
with 108 additions and 414 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment