Norman Jäckel 274648b180 Merge commit 'stable/1.7.x' into master. ... Conflicts: CHANGELOG openslides/__init__.py openslides/assignment/views.py		2015-02-25 13:26:49 +01:00
..
LC_MESSAGES	Updated CHANGELOG. Updated language files (only metadata changes).	2015-02-15 20:43:15 +01:00
javascript.po	angular single page application	2015-02-05 23:06:09 +01:00