Skip to content
Snippets Groups Projects
Commit 51cc941b authored by Laurent's avatar Laurent
Browse files

Merge branch 'master' into origin-dev#86039_pairing_contractuel_bdp89_specs_pret_malle 

Conflicts:
	cosmogramme/cosmozend/tests/application/modules/cosmo/controllers/DataProfileControllerTest.php
	cosmogramme/php/fonctions/objets_saisie.php
	cosmogramme/sql/patch/patch_377.php
	tests/db/UpgradeDBTest.php
parents d8f755e1 08867007
3 merge requests!3297WIP: Master,!3234Dev#86039 pairing contractuel bdp89 specs pret malle,!3229dev #86039 dev#86039 : SIGB Koha : add grouped holds capabilities
Pipeline #8247 failed with stage
in 30 minutes and 47 seconds
Hide whitespace changes
Inline Side-by-side
Showing
with 304 additions and 48 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