Merge branch 'maint-1.0' into maint-1.1
- maint-1.0: BibKnowledge: /kb/export 500 error fix
Conflicts:
modules/bibknowledge/lib/bibknowledgeadmin.py
Tibor Simko <tibor.simko@cern.ch> | Jan 15 2013, 10:12 |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
74fc0b607c8d | Samuele Kaplun/Tibor Simko | BibKnowledge: /kb/export 500 error fix | Jan 8 2013 |