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

There was a problem fetching the latest pipeline status.

Commit e9d81a90 authored 6 years ago by

Ghislain Loas

Merge remote-tracking branch...

Merge remote-tracking branch 'origin/dev#72825_contractuel_bdp64__afficher_la_colonne_reserve_par_d_autres' into origin-master

Conflicts:
	library/Class/TableDescription.php
	library/ZendAfi/Controller/Plugin/Abstract.php
	library/ZendAfi/View/Helper/RenderTable.php

parents a86422b3 40a945a8

Branches

Tags

3 merge requests!2717Master,!2707Tessadoc lost pass,!2679Dev#64573 amelioration de la charte modele

Pipeline #4483 passed with stage

in 38 minutes and 7 seconds

Hide whitespace changes

Inline Side-by-side

Showing with 1184 additions and 83 deletions

Please register or to comment