Merge branch 'origin-dev#55145_contractuel_2455_le_kiosk_recherche_federee' (a2a5a919) · 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.

There was a problem fetching the pipeline stages.

Commit a2a5a919 authored 8 years ago by

Ghislain Loas

Browse files

Merge branch 'origin-dev#55145_contractuel_2455_le_kiosk_recherche_federee'

# Conflicts:
#	cosmogramme/sql/patch/patch_320.php
#	tests/db/UpgradeDBTest.php

parents 673cd627 e2b0d6c5

Branches

Admin message

Merge branch 'origin-dev#55145_contractuel_2455_le_kiosk_recherche_federee'