Merge branch 'master' into dev#48981_3455_lier_des_cartes_via_bokeh (51af8986) · 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 51af8986 authored 8 years ago by

Laurent

Merge branch 'master' into dev#48981_3455_lier_des_cartes_via_bokeh

Conflicts:
	VERSIONS
	library/startup.php
	public/opac/css/global.css
	tests/application/modules/admin/controllers/CmsControllerListModeTest.php

parents 85c7ce26 7a79fc49

Branches

Tags

3 merge requests!2080Sandbox detach zf from storm,!1940Dev#48981 3455 lier des cartes via bokeh,!1929Dev#48981 3455 lier des cartes via bokeh

Hide whitespace changes

Inline Side-by-side

Showing with 262 additions and 58 deletions

Please register or to comment