Diffusion invenio-infoscience 2d8d5355507c

Merge branch 'master' into next
2d8d5355507c
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Dec 19 2011, 17:08.

Description

Merge branch 'master' into next

master: BibCirculation: security check before eval

Conflicts:
modules/bibcirculation/lib/bibcirculation_templates.py
modules/bibcirculation/lib/bibcirculation_utils.py
modules/bibcirculation/lib/bibcirculationadminlib.py

Details

Committed

Tibor Simko <tibor.simko@cern.ch>

Dec 19 2011, 17:15

Parents

R3600:c0ad01dc14f3: BibCirculation: security check before eval
R3600:9453874a41e9: BibCirculation: fixed notes link

Branches

Unknown

Tags

Unknown

Event Timeline

Tibor Simko <tibor.simko@cern.ch> committed R3600:2d8d5355507c: Merge branch 'master' into next (authored by Tibor Simko <tibor.simko@cern.ch>).Dec 19 2011, 17:15

Merged Changes

	Commit			Author	Details	Committed
	c0ad01dc14f3			Jaime Garcia Llopis/Tibor Simko	BibCirculation: security check before eval	Dec 19 2011

Changes (3)

				Path
	M			modules/bibcirculation/lib/bibcirculation_templates.py
	M			modules/bibcirculation/lib/bibcirculation_utils.py
	M			modules/bibcirculation/lib/bibcirculationadminlib.py