Homec4science

Merge branch 'maint-1.0' into maint-1.1

Authored by Tibor Simko <tibor.simko@cern.ch> on Jan 15 2013, 10:12.

Description

Merge branch 'maint-1.0' into maint-1.1

  • maint-1.0: BibKnowledge: /kb/export 500 error fix

Conflicts:
modules/bibknowledge/lib/bibknowledgeadmin.py

Event Timeline

Tibor Simko <tibor.simko@cern.ch> committed R3600:66eb9231008c: Merge branch 'maint-1.0' into maint-1.1 (authored by Tibor Simko <tibor.simko@cern.ch>).Jan 15 2013, 10:12

Merged Changes

CommitAuthorDetailsCommitted
74fc0b607c8dSamuele Kaplun/Tibor Simko
BibKnowledge: /kb/export 500 error fix 
Jan 8 2013