Merge branch 'OpenSlidesError' into workflow_2

Browse Source

Conflicts:
	openslides/utils/exceptions.py

...

This commit is contained in:

Norman Jäckel 2013-02-13 23:05:50 +01:00

parent f2dde228c9 b1f1eee13f

commit 6223b3199d

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

Diff Content Not Available