OpenSlides/openslides
Andy Kittner 5979b23b04 Merge remote-tracking branch 'origin/master' into bug-409
Conflicts:
	openslides/main.py
2012-11-24 20:49:04 +01:00
..
agenda reordered the tests 2012-11-24 15:00:17 +01:00
assignment cleanup 2012-11-24 14:01:21 +01:00
config cleanup 2012-11-24 14:01:21 +01:00
locale Merge branch 'master' of ssh://ssh.github.com/OpenSlides/OpenSlides 2012-11-22 12:52:11 +01:00
motion reordered the tests 2012-11-24 15:00:17 +01:00
participant reordered the tests 2012-11-24 15:00:17 +01:00
poll cleanup 2012-11-24 14:01:21 +01:00
projector cleanup 2012-11-24 14:01:21 +01:00
static Enlarged users select box in new/edit group form. 2012-11-21 22:06:22 +01:00
templates Updated translation for professional support footer. 2012-11-19 23:05:38 +01:00
utils cleanup 2012-11-24 14:01:21 +01:00
__init__.py Prepared 1.3-beta2 release. 2012-11-07 22:21:55 +01:00
global_settings.py reordered the tests 2012-11-24 15:00:17 +01:00
main.py Merge remote-tracking branch 'origin/master' into bug-409 2012-11-24 20:49:04 +01:00
urls.py cleanup 2012-11-24 14:01:21 +01:00