projects / koha-ffzg.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 96eb4c5 1d50baf)
Merge remote-tracking branch 'origin/dev/stetienne' into dev/unilim unilim_maj_130701
authorFridolyn SOMERS <fridolyn.somers@biblibre.com>
Fri, 28 Jun 2013 14:18:01 +0000 (16:18 +0200)
committerFridolyn SOMERS <fridolyn.somers@biblibre.com>
Fri, 28 Jun 2013 14:18:01 +0000 (16:18 +0200)
commitb501d50032f9bb4c1fbe93d9b4d020a28d8ec0a8
tree2fc64e13093b0a16b624e711fc2bb38ab9754106tree | snapshot
parent96eb4c5f4400a51bf0efd4be2f2bfcfeb6ccb142commit | diff
parent1d50baf3d486d9fcf42e3bf08167b921f74ea273commit | diff
Merge remote-tracking branch 'origin/dev/stetienne' into dev/unilim

Conflicts:
acqui/addorderiso2709.pl
acqui/histsearch.pl
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
misc/translator/po/fr-FR-MT11523-staff.po
12 files changed:
acqui/histsearch.pl diff1 | diff2 | blob | history
acqui/pdfformat/layout2pages.pm diff1 | diff2 | blob | history
acqui/pdfformat/layout3pages.pm diff1 | diff2 | blob | history
acqui/pdfformat/layout3pagesfr.pm diff1 | diff2 | blob | history
installer/data/mysql/en/mandatory/sysprefs.sql diff1 | diff2 | blob | history
installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql diff1 | diff2 | blob | history
installer/data/mysql/updatedatabase.pl diff1 | diff2 | blob | history
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tmpl diff1 | diff2 | blob | history
koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl diff1 | diff2 | blob | history
koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl diff1 | diff2 | blob | history
koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl diff1 | diff2 | blob | history
opac/opac-detail.pl diff1 | diff2 | blob | history
KOHA@FFZG based on git://git.koha.org/pub/scm/koha.git