Skip to main content Skip to search

Commit 843e61e1aafb8ccdf0ce839782c1063a7f01f825

Author date: December 27, 2012 9:14

December 27, 2012 9:14

Commit 843e61e on 7.x-1.x-wip

by Alex Arnaud

Custom text: opac: /modules/opac_items/opac_items.admin.inc

++++++-

41 additions & 8 deletions

Custom text: opac: /modules/opac_items/opac_items.api.php

++++---

16 additions & 10 deletions

Custom text: opac: /modules/opac_items/opac_items.js

++----

2 additions & 4 deletions

Custom text: opac: /modules/opac_items/opac_items.module

++++---

152 additions & 105 deletions

Custom text: opac: /modules/opac_users/opac_users.admin.inc

+++---

3 additions & 3 deletions

Custom text: opac: /modules/opac_users/opac_users.module

+++----

15 additions & 19 deletions

Custom text: opac: /translations/fr.po

++++---

294 additions & 247 deletions
```
Merge remote branch 'origin/ft/R362' into 7.x-1.x-wip

Conflicts solved:
modules/opac_items/opac_items.admin.inc
modules/opac_items/opac_items.js
modules/opac_items/opac_items.module
```