René Köcher ed33b47666 Merge branch 'master' of ssh://ssh.github.com/OpenSlides/OpenSlides ... Conflicts: openslides/locale/de/LC_MESSAGES/django.po Signed-off-by: René Köcher <shirk@bitspin.org>		2012-11-22 12:52:11 +01:00
..
django.mo	Merge branch 'master' of ssh://ssh.github.com/OpenSlides/OpenSlides	2012-11-22 12:52:11 +01:00
django.po	Merge branch 'master' of ssh://ssh.github.com/OpenSlides/OpenSlides	2012-11-22 12:52:11 +01:00
djangojs.mo	fix translation	2012-09-13 21:56:50 +02:00
djangojs.po	fix translation	2012-09-13 21:56:50 +02:00