Master (!1716) · 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.

Closed Master

master into sandbox-model-versionning

Closed Patrick Barroca requested to merge master into sandbox-model-versionning 8 years ago

Jul 07, 2016
- Merge branch 'hotline-master' into 'master' · 7e0f57df
  Patrick Barroca authored 8 years ago
```
Hotline master

See merge request !1714
```
  7e0f57df
- version 7.5.36 · 1b4616fb
  Patrick Barroca authored 8 years ago
```
Merge remote-tracking branch 'refs/remotes/afi/stable' into afi-hotline-master

# Conflicts:
#	VERSIONS
#	library/startup.php
```
  1b4616fb
- version 7.4.26 · e5e0b353
  Patrick Barroca authored 8 years ago
  
  e5e0b353
Jul 06, 2016
- Merge branch... · 0143acb4
  Patrick Barroca authored 8 years ago
```
Merge branch 'hotline#45291_re_urgent___probleme_lors_de_mise_a_jour_d_un_abonne_pergame' into 'stable'

rel #45291 : read mysql host from config, use PDO instead of deprecated mysql extension

See merge request !1713
```
  0143acb4
- rel #45291 : fix RT · 7180b68f
  Patrick Barroca authored 8 years ago
  
  7180b68f
- Fix cosmopath when a directory named '0' exists · 0def466c
  Laurent authored 8 years ago and Patrick Barroca committed 8 years ago
  
  0def466c
- rel #45291 : read mysql host from config, use PDO instead of deprecated mysql extension · 45c9a417
  Patrick Barroca authored 8 years ago
  
  45c9a417