Merge branch 'master' into... (144ef906) · Commits · afi / opacce

Snippets Groups Projects

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

Commit 144ef906 authored 5 years ago by

Arthur Suzuki

Browse files

Merge branch 'master' into...

Merge branch 'master' into origin-dev#91508_gateway_timeout_affichage_de_la_liste_des_prets_trop_long

Conflicts:
	cosmogramme/php/fonctions/objets_saisie.php
	library/Class/WebService/SIGB/Koha.php
	library/Class/WebService/SIGB/Koha/Service.php
	tests/fixtures/KohaFixtures.php

parents f4455c0d dcb308b8

Branches

Admin message

Merge branch 'master' into...