Merge branch 'maint-1.1'
ff0f6373d190
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Nov 29 2013, 10:25.

Description

Merge branch 'maint-1.1'

maint-1.1: I18N: collection demo names for new translations installation: location of jquery-1.7.1.min.js

NOTE During merge, enriched list of demo collections to translate to reflect new collections in the master branch.

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

Committed

Tibor Simko <tibor.simko@cern.ch>

Nov 29 2013, 10:27

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:ff0f6373d190: Merge branch 'maint-1.1' (authored by Tibor Simko <tibor.simko@cern.ch>).Nov 29 2013, 10:27

	Commit			Author	Details	Committed
	a6c3171f2657			Tibor Simko	I18N: collection demo names for new translations	Nov 29 2013
	954b5a05a277			Tibor Simko	installation: location of jquery-1.7.1.min.js	Nov 29 2013

				Path
	M			ABOUT-NLS
	M			Makefile.am