Homec4science

Merge branch 'maint-1.0' into maint-1.1

Authored by Tibor Simko <tibor.simko@cern.ch> on May 2 2013, 02:01.

Description

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

Event Timeline

Tibor Simko <tibor.simko@cern.ch> committed R3600:b8621ac509ff: Merge branch 'maint-1.0' into maint-1.1 (authored by Tibor Simko <tibor.simko@cern.ch>).May 2 2013, 02:01

Merged Changes

CommitAuthorDetailsCommitted
f7d3d8cae6aaTibor Simko
Merge branch 'maint-0.99' into maint-1.0 
May 2 2013
c7eb8d8608c2Jerome Caffaro/Tibor Simko
BibFormat: fix CLI call to old PHP-based formatter 
May 2 2013