Skip to main content Skip to search

Commit 8a2d7ac06f320c6be9b3e74aeaf38f82c3cfc578

Author date: December 5, 2012 10:23

December 5, 2012 10:23

Commit 8a2d7ac on 7.x-1.x, 7.x-1.x-wip

by veggiematts

Custom text: 1833210: /koha.conf

++++---

295 additions & 279 deletions

Custom text: 1833210: /koha.inc

+++---

63 additions & 63 deletions

Custom text: 1833210: /plugins/concatenation.inc

+++----

19 additions & 20 deletions
```
Merge remote-tracking branch 'origin/ft/R506' into 7.x-1.x

Conflicts:
koha.inc
plugins/concatenation.inc
```