merge error : reintroducing ajax.tmpl
authorPaul Poulain <paul.poulain@biblibre.com>
Fri, 5 Jun 2009 06:36:11 +0000 (08:36 +0200)
committerHenri-Damien LAURENT <henridamien.laurent@biblibre.com>
Wed, 30 Sep 2009 09:30:26 +0000 (11:30 +0200)
commiteba29b259b513a7c10a1b8ca3ac06ead074ef72e
treedc1acf8b8228c92554d98341f8a43bbbf2178d6e
parent521bb9654dd87078adc03def1f5cccfc1c80102d
merge error : reintroducing ajax.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ajax.tmpl [new file with mode: 0644]