Master (!1635) · Merge requests · afi / opacce

Merged Master

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

May 03, 2016
- Merge branch 'php7-compatibility' into 'master' · 3aceb791
  Patrick Barroca authored 8 years ago
```
Php7 compatibility

See merge request !1634
```
  3aceb791
- update upstream storm · 370620dc
  Patrick Barroca authored 8 years ago
  
  370620dc
- fix test failure · e829d076
  Patrick Barroca authored 8 years ago
  
  e829d076
- fix test failure · ce5b7b71
  Patrick Barroca authored 8 years ago
  
  ce5b7b71
- Merge remote-tracking branch 'master' into php7-compatibility · 2afb00b3
  Patrick Barroca authored 8 years ago
  
  2afb00b3
- update upstream storm · 3c42d912
  Patrick Barroca authored 8 years ago
  
  3c42d912
Mar 21, 2016
- Merge branch 'master' into origin-php7-compatibility · b95423e3
  Laurent authored 9 years ago
```
# Conflicts:
#	library/Class/Catalogue.php
#	library/storm
```
  b95423e3
Feb 09, 2016
- php7 compatibility · e882dfad
  Patrick Barroca authored 9 years ago
  
  e882dfad
Feb 05, 2016
- php7 compatibility · e56673be
  Laurent authored 9 years ago and Patrick Barroca committed 9 years ago
  
  e56673be
Feb 03, 2016
- php7 compatibility · 9a8b41d8
  Patrick Barroca authored 9 years ago
  
  9a8b41d8

Admin message