Skip to content
Snippets Groups Projects
Commit e4bac2ad authored by aspangaro's avatar aspangaro
Browse files

Merge remote-tracking branch 'Upstream/develop' into develop-57 

Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
parents bd69d37c 25fca661
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 138 additions and 67 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