Hotline master (!1343) · 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 Hotline master

hotline-master into master

Merged Patrick Barroca requested to merge hotline-master into master 9 years ago

Dec 14, 2015
- version 7.3.37 · 2f0780ef
  Patrick Barroca authored 9 years ago
```
Merge remote-tracking branch 'refs/remotes/afi/stable' into afi-hotline-master

# Conflicts:
#	VERSIONS
#	library/startup.php
```
  2f0780ef
- version 7.2.34 · c762aaa3
  Patrick Barroca authored 9 years ago
  
  c762aaa3
- Merge branch... · a093e2df
  Patrick Barroca authored 9 years ago
```
Merge branch 'hotline#33712_affecter_les_paniers_admin_exportes_depuis_nanook_a_sysadm' into 'stable'

Hotline#33712 affecter les paniers admin exportes depuis nanook a sysadm

See merge request !1340
```
  a093e2df
- rel #33712 : link nanook baskets to super admin · 1e296ed0
  Patrick Barroca authored 9 years ago
  
  1e296ed0
- Merge branch 'hotline#33149_mise_en_place_connecteur_le_kiosk' into 'hotline-master' · 65778f1c
  Patrick Barroca authored 9 years ago
```
Hotline#33149 mise en place connecteur le kiosk

See merge request !1339
```
  65778f1c
Dec 11, 2015
- rel #33149 : fix tests failures · 466542f6
  Patrick Barroca authored 9 years ago
  
  466542f6
- rel #33149 : fix SSO link and redirect · 73a30ec9
  Patrick Barroca authored 9 years ago
  
  73a30ec9
- rel #33149 : fix SSO link and redirect · e0369bf8
  Patrick Barroca authored 9 years ago
  
  e0369bf8