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

Merge branch 'master' into origin-dev#33757_gestion_des_preferences_de_l_utilisateur 

Conflicts:
	tests/db/UpgradeDBTest.php
parents 22c0110c 5117df83
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 772 additions and 561 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