Merge branch 'maint-1.0' into maint-1.1
37e5c11b0cf1
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Nov 2 2012, 10:17.

Description

Merge branch 'maint-1.0' into maint-1.1

Conflicts:
modules/bibformat/lib/bibformat_templates.py
modules/bibformat/web/admin/Makefile.am

Committed

Tibor Simko <tibor.simko@cern.ch>

Nov 2 2012, 10:17

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:37e5c11b0cf1: Merge branch 'maint-1.0' into maint-1.1 (authored by Tibor Simko <tibor.simko@cern.ch>).Nov 2 2012, 10:17

	Commit			Author	Details	Committed
	2232d96c911c			Tibor Simko	BibFormat: fix for js_quicktags location	Nov 2 2012

				Path
	M			modules/bibformat/lib/bibformat_templates.py
	M			modules/bibformat/web/admin/Makefile.am