Merge branch 'stable/1.6.x' into 'master'.

Conflicts:
	CHANGELOG
This commit is contained in:
Norman Jäckel 2015-01-17 10:27:27 +01:00
commit 86261bda28

View File

@ -24,8 +24,8 @@ Version 1.7 (unreleased)
Core: Core:
- New feature to tag motions, agenda and assignments. - New feature to tag motions, agenda and assignments.
- Fixed search index problem to index contents of many-to-many table - Fixed search index problem to index contents of many-to-many tables
(e.g. tags of a motion). (e. g. tags of a motion).
Motions: Motions:
- New Feature to create amendments, which are related to a parent motion. - New Feature to create amendments, which are related to a parent motion.
- Added possibility to hide motions from non staff users in some states. - Added possibility to hide motions from non staff users in some states.