projects / koha-ffzg.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 559be1b 6face12)
Merge remote-tracking branch 'origin/dev/solr' into dev/stetienne stetienne_maj_110817
authorJulian Maurice <julian.maurice@biblibre.com>
Wed, 17 Aug 2011 08:28:51 +0000 (10:28 +0200)
committerJulian Maurice <julian.maurice@biblibre.com>
Wed, 17 Aug 2011 08:28:51 +0000 (10:28 +0200)
commit14bb58d092099dd8df3c3dd5d7bff705d1a94839
tree699de37d3408e047018a029cf3821e977a1a685ftree | snapshot
parent559be1b8a61fa81e83b905dd09e0abfbe2b937cccommit | diff
parent6face12c1d4d517b7486a4c3db100af1b293884ecommit | diff
Merge remote-tracking branch 'origin/dev/solr' into dev/stetienne

Solved conflicts:
koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchedit.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchedit.tmpl diff1 | diff2 | blob | history
KOHA@FFZG based on git://git.koha.org/pub/scm/koha.git