Master (!2156) · 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 WIP

Merged Patrick Barroca requested to merge master into WIP 7 years ago

May 18, 2017
- Merge branch 'hotline-master' into 'master' · 052336cf
  Patrick Barroca authored 7 years ago
```
Hotline master

See merge request !2155
```
  052336cf
- version 7.9.19 · 0c21ee71
  Patrick Barroca authored 7 years ago
  
  0c21ee71
May 17, 2017
- Merge remote-tracking branch 'refs/remotes/afi/stable' into afi-hotline-master · c432c371
  Patrick Barroca authored 7 years ago
```
# Conflicts:
#	cosmogramme/php/classes/classe_log.php
```
  c432c371
- Merge branch 'hotline#60547_bug_cosmo_provide_suggest' into 'stable' · ba4fe049
  Patrick Barroca authored 7 years ago
```
hotline #60547 : revert too large search and replace of ->ecrire() to ->log() calls

See merge request !2153
```
  ba4fe049
- hotline #60547 : revert too large search and replace of ->ecrire() to ->log() calls · 82b9a2ec
  Patrick Barroca authored 7 years ago
  
  82b9a2ec