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

Merge branch 'master' into origin-rd_#14085_pnb

Conflicts:
	cosmogramme/sql/patch/patch_239.php
parents 6357a3f5 f0b81869
Branches
Tags
6 merge requests!780Master,!767Master,!764Dev#21988 consultation pnb,!753Dev#21988 consultation pnb,!744Dev #21987 register ip pnb,!733Rd #14085 pnb
Showing
with 427 additions and 406 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