Homec4science

Merge branch 'maint-1.0'

Authored by Tibor Simko <tibor.simko@cern.ch> on Jul 6 2012, 10:07.

Description

Merge branch 'maint-1.0'

  • maint-1.0: WebJournal: use CFG_TMPSHAREDDIR in admin UI

Conflicts:
modules/webjournal/lib/webjournaladminlib.py

Event Timeline

Tibor Simko <tibor.simko@cern.ch> committed R3600:9475f5ffb754: Merge branch 'maint-1.0' (authored by Tibor Simko <tibor.simko@cern.ch>).Jul 6 2012, 10:07

Merged Changes

CommitAuthorDetailsCommitted
edd9a38d78c2Jerome Caffaro/Tibor Simko
WebJournal: use CFG_TMPSHAREDDIR in admin UI 
Jul 6 2012