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
Tibor Simko <tibor.simko@cern.ch> | Jun 6 2012, 13:42 |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
56b96c4b6cd4 | Samuele Kaplun/Tibor Simko | BibUpload: fix setting restriction in -a/-ir modes | Jun 6 2012 | |||
984071a97e53 | Olivier Canévet/Tibor Simko | WebComment: only logged users to use report abuse | May 30 2012 |