Merge branch 'maint-1.0'
a3c6b1a324b1
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Aug 23 2012, 10:52.

Description

Merge branch 'maint-1.0'

Conflicts:
modules/miscutil/lib/inveniocfg.py
modules/websubmit/lib/websubmit_webinterface.py

Committed

Tibor Simko <tibor.simko@cern.ch>

Aug 23 2012, 10:52

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:a3c6b1a324b1: Merge branch 'maint-1.0' (authored by Tibor Simko <tibor.simko@cern.ch>).Aug 23 2012, 10:52

	Commit			Author	Details	Committed
	47e4a3364a9c			Samuele Kaplun/Tibor Simko	WebSubmit: configurable Document File Manager	Aug 23 2012

				Path
	M			config/invenio.conf
	M			modules/miscutil/lib/inveniocfg.py
	M			modules/websubmit/lib/websubmit_config.py
	M			modules/websubmit/lib/websubmit_webinterface.py