Skip to content
Snippets Groups Projects
Commit a2022ee3 authored by Patrick Barroca's avatar Patrick Barroca :grin:
Browse files

Merge remote-tracking branch 'refs/remotes/origin/master' into...

Merge remote-tracking branch 'refs/remotes/origin/master' into origin-dev#71949_contractuel_pairing_minsoc_ne_pas_enregistrer_le_mot_de_passe_dans_bokeh

Conflicts:
	library/Class/AdminVar.php
parents f2ca0598 cc0c889b
Branches
Tags
2 merge requests!2561Master,!2555Dev#71949 contractuel pairing minsoc ne pas enregistrer le mot de passe dans bokeh
Pipeline #3705 passed with stage
in 53 minutes and 16 seconds
Showing
with 506 additions and 64 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