Merge branch 'maint-1.0' into maint-1.1
- maint-1.0: BibFormat: fix CLI call to old PHP-based formatter
Conflicts:
modules/bibformat/lib/bibformat_engine.py
Tibor Simko <tibor.simko@cern.ch> | May 2 2013, 02:01 |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
f7d3d8cae6aa | Tibor Simko | Merge branch 'maint-0.99' into maint-1.0 | May 2 2013 | |||
c7eb8d8608c2 | Jerome Caffaro/Tibor Simko | BibFormat: fix CLI call to old PHP-based formatter | May 2 2013 |