Homec4science

Merge branch 'maint-1.0'

Authored by Tibor Simko <tibor.simko@cern.ch> on Jun 6 2012, 13:42.

Description

Merge branch 'maint-1.0'

  • maint-1.0: BibUpload: fix setting restriction in -a/-ir modes WebComment: only logged users to use report abuse

Conflicts:
modules/bibupload/lib/bibupload.py

Event Timeline

Tibor Simko <tibor.simko@cern.ch> committed R3600:befe685cdc05: Merge branch 'maint-1.0' (authored by Tibor Simko <tibor.simko@cern.ch>).Jun 6 2012, 13:42

Merged Changes

CommitAuthorDetailsCommitted
56b96c4b6cd4Samuele Kaplun/Tibor Simko
BibUpload: fix setting restriction in -a/-ir modes 
Jun 6 2012
984071a97e53Olivier Canévet/Tibor Simko
WebComment: only logged users to use report abuse 
May 30 2012