Homec4science

Merge branch 'maint-1.1'

Authored by Tibor Simko <tibor.simko@cern.ch> on Aug 27 2014, 19:34.

Description

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>

Event Timeline

Tibor Simko <tibor.simko@cern.ch> committed R3600:abadedda4513: Merge branch 'maint-1.1' (authored by Tibor Simko <tibor.simko@cern.ch>).Aug 27 2014, 19:44

Merged Changes

CommitAuthorDetailsCommitted
96b23a3c6566Tibor Simko
Merge branch 'maint-1.0' into maint-1.1 
Aug 27 2014
26c1ec630496Samuele Kaplun/Tibor Simko
BibDocFile: FFT comment/description documentation 
Aug 27 2014