Merge remote branch 'upstream/master'

Conflicts: openslides/motion/models.py
2013-03-11 19:16:16 +01:00 · 2013-03-11 19:16:16 +01:00 · 1b93cec209
commit 1b93cec209
parent 5c70b4a044 73723feb74
1 changed files with 2 additions and 2 deletions
--- a/openslides/motion/models.py
+++ b/openslides/motion/models.py
@ -394,8 +394,8 @@ class Motion(SlideMixin, models.Model):
                        not self.is_supporter(person)),

            'unsupport': (self.state.allow_support and
-                        not self.is_submitter(person) and
-                        self.is_supporter(person)),
+                          not self.is_submitter(person) and
+                          self.is_supporter(person)),

            'change_state': person.has_perm('motion.can_manage_motion'),