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

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

# Conflicts:
#	htdocs/install/mysql/migration/5.0.0-6.0.0.sql
parents 1401e926 0838953e
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 854 additions and 399 deletions
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