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

Merged Master

master into WIP

Merged Laurent requested to merge master into WIP 10 years ago

Oct 13, 2014
- V 6.54.0 · 4ae6af32
  Laurent authored 10 years ago
  
  4ae6af32
- Merge branch 'hotline_6.53' into 'master' · 1e8bea09
  Laurent authored 10 years ago
```
Hotline 6.53

See merge request !442
```
  1e8bea09
- Merge branch 'dev#14008_libelles_parametrables' · 8cb46ccd
  Laurent authored 10 years ago
```
Conflicts:
	library/Class/AdminVar.php
```
  8cb46ccd
- Merge branch 'dev#16260_lectura_sso' into 'master' · f29df1f9
  Laurent authored 10 years ago
```
Dev#16260 lectura sso

See merge request !440
```
  f29df1f9
- Merge branch 'dev#16320_loire_forez_skin' into 'master' · daf1b151
  Laurent authored 10 years ago
```
Dev#16320 loire forez skin

See merge request !439
```
  daf1b151
Oct 10, 2014
- translation of first sentence. · cfa84e1e
  Claire Hernandez authored 10 years ago
  
  cfa84e1e
Oct 08, 2014
- Fix INSTALL link · b162cec5
  Patrick Barroca authored 10 years ago
  
  b162cec5
- Link to INSTALL.md fixed to INSTALL.fr.md · 5ee1a600
  Patrick Barroca authored 10 years ago
  
  5ee1a600
- Contrib instrutions translated · c718256b
  Patrick Barroca authored 10 years ago
  
  c718256b
- Installation instrutions translated · 8fbecf1f
  Patrick Barroca authored 10 years ago
  
  8fbecf1f
- Merge branch 'hotline_#15962_fix_cloud_tags_label_in_search_result' into 'hotline_6.53' · e5737ce5
  Ghislain Loas authored 10 years ago
```
Hotline #15962 fix cloud tags label in search result

See merge request !435
```
  e5737ce5
Oct 07, 2014
- hotline #15962 fix cloud tags title in search result, reading conf · feda6e86
  Ghislain Loas authored 10 years ago
  
  feda6e86
Oct 06, 2014
- 6.53.4 · 2e7c832d
  Patrick Barroca authored 10 years ago
  
  2e7c832d
- Merge branch 'hotline_#16628-lost-interests' into 'hotline_6.53' · e9aa92f1
  Patrick Barroca authored 10 years ago
```
Hotline #16628 lost interests

See merge request !434
```
  e9aa92f1
- 6.53.3 · 7cc81428
  Patrick Barroca authored 10 years ago
  
  7cc81428
- Merge branch 'hotline_6.53' into 'master' · 46db2605
  Laurent authored 10 years ago
```
Hotline 6.53

See merge request !433
```
  46db2605

Admin message

Master

Merge request reports

Activity