Merge branch 'maint-1.0' into maint-1.1
c3b3e1a28cce
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Apr 28 2015, 15:22.

Description

Merge branch 'maint-1.0' into maint-1.1

Conflicts:
modules/websession/lib/session.py
modules/webstyle/lib/webinterface_handler_wsgi_utils.py

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

Committed

Tibor Simko <tibor.simko@cern.ch>

Apr 28 2015, 15:22

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:c3b3e1a28cce: Merge branch 'maint-1.0' into maint-1.1 (authored by Tibor Simko <tibor.simko@cern.ch>).Apr 28 2015, 15:22

	Commit			Author	Details	Committed
	e83f600fea90			Tibor Simko	WebStyle: HttpOnly cookie attribute	Apr 28 2015

				Path
	M			modules/websession/lib/session.py
	M			modules/webstyle/lib/webinterface_handler_wsgi_utils.py