Skip to content
Snippets Groups Projects
Commit c07e26dc authored by Marcos García de La Fuente's avatar Marcos García de La Fuente
Browse files

Merge branch 'develop' into fr-2613

Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
parents dc790ff5 21a6fd1c
No related branches found
No related tags found
No related merge requests found
Showing
with 230 additions and 47 deletions
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