Merge branch 'maint-1.0'
- maint-1.0: WebJournal: use CFG_TMPSHAREDDIR in admin UI
Conflicts:
modules/webjournal/lib/webjournaladminlib.py
Tibor Simko <tibor.simko@cern.ch> | Jul 6 2012, 10:07 |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
edd9a38d78c2 | Jerome Caffaro/Tibor Simko | WebJournal: use CFG_TMPSHAREDDIR in admin UI | Jul 6 2012 |