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

Merged Master

master into WIP

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

May 21, 2014
- Merge branch 'origin-hotline_6.43' · c06ba3cd
  Patrick Barroca authored 10 years ago
```
Conflicts:
	VERSIONS
	library/startup.php
```
  c06ba3cd
- 6.43.5 · bf5fae69
  Patrick Barroca authored 10 years ago
  
  bf5fae69
- 6.43.4 · 1697798a
  Patrick Barroca authored 10 years ago
  
  1697798a
- Merge branch 'hotline#13696_valence_koha_prolongations' into 'hotline_6.43' · 1811a188
  Patrick Barroca authored 10 years ago
```
Hotline#13696 Valence Koha Prolongations
```
  1811a188
- Merge branch 'hotline#13079_casa_opsys_modify_display_pieges' into 'hotline_6.43' · 0af9d82d
  Patrick Barroca authored 10 years ago
```
Hotline#13079 Casa Opsys Modify Display Pieges
```
  0af9d82d
- Update VERSIONS · 0e044bc1
  Laurent authored 10 years ago
  
  0e044bc1
- Merge remote-tracking branch 'origin/hotline_6.43' · 282b956d
  Laurent authored 10 years ago
```
Conflicts:
	VERSIONS
```
  282b956d
- Merge branch 'origin-SPRINT3_DEV_#13296_formation_widget' · 3be9bc14
  Laurent authored 10 years ago
```
Conflicts:
	library/startup.php
```
  3be9bc14
- Merge branch 'hotline#13597_validation_tags' into 'hotline_6.43' · 6ea269d9
  Patrick Barroca authored 10 years ago
```
Hotline#13597 Validation Tags
```
  6ea269d9
May 20, 2014
- Update storm · 5da95bf9
  Patrick Barroca authored 10 years ago
  
  5da95bf9
- hotline#13079 : opsys : display piegeb instead of Piege or Piège if exists · 8c7a6e13
  efalcy authored 10 years ago
  
  8c7a6e13
- Merge branch 'dev#13234_centres_interet' into 'master' · 41432f21
  Patrick Barroca authored 10 years ago
```
Dev#13234 Centres Interet
```
  41432f21
- hotline#13696 Koha renewals : test webservice returns error according 2 differents koha versions · cdb06bf8
  efalcy authored 10 years ago
  
  cdb06bf8
May 17, 2014
- hotline #13597 · a1ed0946
  Laurent authored 10 years ago
```
update VERSIONS
```
  a1ed0946
- hotline #13595 tag validation · fbba945c
  Laurent authored 10 years ago
```
adapt to new Storm fix (underscorization AField -> a_field)
```
  fbba945c

Admin message

Master

Merge request reports

Activity