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

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

Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
parents 16585553 4b031e9e
No related branches found
No related tags found
No related merge requests found
Showing
with 51 additions and 58 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment