Merge remote-tracking branch... (b48b9407) · Commits · 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.

Commit b48b9407 authored 9 years ago by

lbrun

Merge remote-tracking branch...

Merge remote-tracking branch 'refs/remotes/origin/dev#39487_2640_story_1_bibliotheque__rechercher_une_bibliotheque_avec_filtres' into dev#39488_2640_story_2_bibliotheque__rechercher_une_bibliotheque_avec_filtres

Conflicts:
library/ZendAfi/View/Helper/RenderLibraryOpening.php

parents 32a43698 236c31bd

Branches

Tags

4 merge requests!1659Master,!1587Master,!1568Dev#39820 bonus story 3 affichage en facette affichage en cases a cocher,!1554Dev#39488 2640 story 2 bibliotheque rechercher une bibliotheque avec filtres

Hide whitespace changes

Inline Side-by-side

Showing with 5 additions and 22 deletions

Please register or to comment