Merge branch 'master' into sandbox_fusion_search_result_and_print (1e6f8482) · 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 1e6f8482 authored 9 years ago by

Ghislain Loas

Browse files

Merge branch 'master' into sandbox_fusion_search_result_and_print

Conflicts:
	tests/library/ZendAfi/View/Helper/Admin/MenuGaucheAdminTest.php

parents aa0682d1 51bb9eed

5 merge requests!1132Hotline#29412 images des articles dans le resultat de recherche,!1120Master,!1079Dev #17782 merge print fusion,!1073Dev#17782 bonus 1 imprimer la liste des notices,!1062Sandbox fusion search result and print

Hide whitespace changes

Inline Side-by-side

Showing with 792 additions and 736 deletions

Please register or to comment

Admin message

Merge branch 'master' into sandbox_fusion_search_result_and_print