Merge branch 'maint-1.0' into maint-1.1
96b23a3c6566
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Aug 27 2014, 15:30.

Description

Merge branch 'maint-1.0' into maint-1.1

Conflicts:
modules/bibupload/doc/admin/bibupload-admin-guide.webdoc

Signed-off-by: Tibor Simko <tibor.simko@cern.ch>

Committed

Tibor Simko <tibor.simko@cern.ch>

Aug 27 2014, 15:30

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:96b23a3c6566: Merge branch 'maint-1.0' into maint-1.1 (authored by Tibor Simko <tibor.simko@cern.ch>).Aug 27 2014, 15:30

	Commit			Author	Details	Committed
	26c1ec630496			Samuele Kaplun/Tibor Simko	BibDocFile: FFT comment/description documentation	Aug 27 2014

				Path
	M			modules/bibupload/doc/admin/bibupload-admin-guide.webdoc