Merge branch 'maint-1.0'
- maint-1.0: WebSearch: add hack for FP collections BibFormat: fix retrieval of collection identifier
Conflicts:
modules/bibformat/lib/elements/bfe_collection.py
Description
Description
Details
Details
- Committed
Tibor Simko <tibor.simko@cern.ch> Jun 15 2012, 18:26 - Parents
- R3600:a78633724cd6: BibFormat: fixes not displaying bfe_bookmark
R3600:9d627d4152ab: WebSearch: add hack for FP collections - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 9d627d4152ab | Ludmila Marian/Tibor Simko | WebSearch: add hack for FP collections | Jun 15 2012 | |||
| d4a9775840b1 | Ludmila Marian/Tibor Simko | BibFormat: fix retrieval of collection identifier | Jun 15 2012 |