Oskar Hahn 0cf0e58af9 Merge branch 'master' of git://github.com/emanuelschuetze/OpenSlides ... Conflicts: openslides/assignment/models.py		2012-09-13 15:28:35 +02:00
..
django.mo	Updated translations.	2012-09-11 20:50:53 +02:00
django.po	Updated translations.	2012-09-11 20:50:53 +02:00
djangojs.mo	translate agenda hidden filter in js	2012-09-13 15:21:43 +02:00
djangojs.po	translate agenda hidden filter in js	2012-09-13 15:21:43 +02:00