Merge remote branch 'upstream/master'

Browse Source

Conflicts:
	openslides/motion/models.py

...

This commit is contained in:

Emanuel Schuetze 2013-03-11 19:16:16 +01:00

parent 5c70b4a044 73723feb74

commit 1b93cec209

1 changed files with 2 additions and 2 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files