Merge branch 'maint-2.1'
c081060e9cb0
Actions

Authored by kuncar on Sep 8 2015, 09:59.

Description

Merge branch 'maint-2.1'

Committed

kuncar

Sep 8 2015, 09:59

Parents

Branches

Unknown

Tags

Unknown

Jiri Kuncar <jiri.kuncar@cern.ch> committed R3600:c081060e9cb0: Merge branch 'maint-2.1' (authored by Jiri Kuncar <jiri.kuncar@cern.ch>).Sep 8 2015, 09:59

	Commit			Author	Details	Committed
	5831ee2238de			Jiri Kuncar	Merge branch 'maint-2.0' into maint-2.1	Sep 8 2015
	f16e3b46f159			Nicolas Harraudeau	global: fix "error(html_safe)" flash messages	Sep 8 2015

		Path
M		invenio/base/templates/_macros.html
A	(dir)	invenio/base/testsuite/test_apps/
P		invenio/base/testsuite/test_apps/__init__.py Copied from invenio/modules/jsonalchemy/testsuite/models/test_oldvalue.cfg
A	(dir)	invenio/base/testsuite/test_apps/flash_msg/
P		invenio/base/testsuite/test_apps/flash_msg/__init__.py Copied from invenio/modules/jsonalchemy/testsuite/models/test_oldvalue.cfg
P		invenio/base/testsuite/test_apps/flash_msg/views.py Copied from invenio/modules/authors/views.py
A		invenio/base/testsuite/test_flash_security.py