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

Closed Master

Closed Laurent requested to merge master into WIP 10 years ago

Jul 18, 2014
- Merge branch 'dev#13881-lekiosk' into 'master' · ce8c2edc
  Meusburger authored 10 years ago
```
Dev#13881 Lekiosk
```
  ce8c2edc
- Merge branch 'RF15122_champ_pseudo' into 'master' · 0cf1cfec
  Meusburger authored 10 years ago
```
Rf15122 Champ Pseudo
```
  0cf1cfec
- Fix failing test on gitlab · 99a98352
  Laurent authored 10 years ago
  
  99a98352
Jul 17, 2014

Merge remote-tracking branch 'origin/dev#12521_cyberlibris' · 3a2f1e75

Matthias Meusburger authored 10 years ago

Conflicts:
	application/modules/admin/controllers/UsergroupController.php
	library/Class/AdminVar.php
	library/Class/UserGroup.php
	tests/application/modules/admin/controllers/UserGroupControllerTest.php

3a2f1e75

Admin message

Master

Merge request reports

Activity