Master (!2600) · Merge requests · 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.

Merged Master

master into dev#73871_minsoc_xlst_etape_2_association_fichier_xslt

Merged Patrick Barroca requested to merge master into dev#73871_minsoc_xlst_etape_2_association_fichier_xslt 7 years ago

Apr 16, 2018
- Merge branch... · dd191f4a
  Patrick Barroca authored 7 years ago
```
Merge branch 'dev#70388_planif_contractuel_minsoc__formulaire_gerer_le_rendu_cote_back' into 'master'

Dev#70388 planif contractuel minsoc  formulaire gerer le rendu cote back

See merge request !2599
```
  dd191f4a
- dev #70388 : menu icon · 6c6e2712
  Patrick Barroca authored 7 years ago
  
  6c6e2712
- Merge remote-tracking branch 'refs/remotes/origin/master' into... · 5bf618d9
  Patrick Barroca authored 7 years ago
```
Merge remote-tracking branch 'refs/remotes/origin/master' into origin-dev#70388_planif_contractuel_minsoc__formulaire_gerer_le_rendu_cote_back

Conflicts:
	library/Class/AdminVar.php
```
  5bf618d9
- dev #70388 : better version file · 124bb422
  Patrick Barroca authored 7 years ago
  
  124bb422
- dev #70388 : fix bad actions controller + test · 565fae18
  Patrick Barroca authored 7 years ago
  
  565fae18