Master (!1216) · Merge requests · afi / opacce · GitLab

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.

Merged Master

master into WIP

Merged Ghislain Loas requested to merge master into WIP 9 years ago

Nov 02, 2015

Merge branch... · 9b86de60

Ghislain Loas authored 9 years ago

Merge branch 'dev#32110_bonus_pnb_ecran_intermediaire_de_pret_texte_riche_d_aide_parametrable_par_la_mediatheque' into 'master'

Dev#32110 bonus pnb ecran intermediaire de pret texte riche d aide parametrable par la mediatheque

See merge request !1210

9b86de60

Merge branch 'dev#25569_boite_sitotheque_afficher_les_derniers_sites_d_une_categorie' · 614943a4
Ghislain Loas authored 9 years ago
```
Conflicts:
	tests/application/modules/opac/controllers/SitoControllerTest.php
```
614943a4
Merge branch 'dev#27641_renvois_bnf_auteur_mot_matieres' into 'master' · 3f27e89a
Ghislain Loas authored 9 years ago
```
Dev#27641 renvois bnf auteur mot matieres

See merge request !1208
```
3f27e89a