Skip to content
Snippets Groups Projects
Commit 7c4eae39 authored by Laurent's avatar Laurent
Browse files

Merge branch 'stable' into...

Merge branch 'stable' into origin-hotline#30552_le_pseudo_d_un_utilisateur_abonne_sigb_ne_resiste_pas_a_la_mise_a_jour

Conflicts:
	cosmogramme/sql/patch/patch_267.php
parents a1b9df07 ed24f061
Branches
Tags
3 merge requests!1192Master,!1191Hotline master,!1189Hotline#30552 le pseudo d un utilisateur abonne sigb ne resiste pas a la mise a jour
Showing with 221 additions and 24 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