Merge branch 'maint-1.0' into maint-1.1
- maint-1.0: BibUpload: FFT replace warning in guide
Conflicts:
modules/bibupload/doc/admin/bibupload-admin-guide.webdoc
Signed-off-by: Tibor Simko <tibor.simko@cern.ch>
Tibor Simko <tibor.simko@cern.ch> | Nov 28 2013, 17:49 |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
bf2ede26c1c5 | Tibor Simko | BibUpload: FFT replace warning in guide | Nov 28 2013 |