Skip to content
Snippets Groups Projects
Commit 8c79042f authored by Ghislain Loas's avatar Ghislain Loas
Browse files

Merge branch 'dev#48678_afi_multimedia_ouvertures_des_postes_multimedia'

Conflicts:
	cosmogramme/sql/patch/patch_311.php
	tests/db/UpgradeDBTest.php
parents 9a7f0c7e bbd5377b
Branches
Tags
1 merge request!1864Master
Showing
with 439 additions and 217 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