Skip to content
Snippets Groups Projects
Commit e4640ca4 authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Merge remote-tracking branch 'origin/3.6' into 3.7

Conflicts:
	htdocs/install/upgrade.php
parents f13df0f9 0cad938e
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment