Merge branch 'maint-1.1'
- maint-1.1: BibDocFile: FFT comment/description documentation
Conflicts:
modules/bibupload/doc/admin/bibupload-admin-guide.webdoc
Signed-off-by: Tibor Simko <tibor.simko@cern.ch>
Description
Description
Details
Details
- Committed
Tibor Simko <tibor.simko@cern.ch> Aug 27 2014, 19:44 - Parents
- R3600:96b23a3c6566: Merge branch 'maint-1.0' into maint-1.1
R3600:18f48e46ffc1: Merge branch 'maint-1.1' - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 96b23a3c6566 | Tibor Simko | Merge branch 'maint-1.0' into maint-1.1 | Aug 27 2014 | |||
| 26c1ec630496 | Samuele Kaplun/Tibor Simko | BibDocFile: FFT comment/description documentation | Aug 27 2014 |