OpenSlides/openslides
Oskar Hahn 5c6f7a41a8 Merge branch 'stable/1.6.x'
Conflicts:
	tests/assignment/test_views.py
2014-10-18 08:53:51 +02:00
..
account Use python3 2014-08-24 21:21:11 +02:00
agenda Merge branch 'stable/1.6.x' 2014-10-18 08:53:51 +02:00
assignment Merge branch 'stable/1.6.x' 2014-10-18 08:53:51 +02:00
config Use python3 2014-08-24 21:21:11 +02:00
core Merge branch 'stable/1.6.x' 2014-10-18 08:53:51 +02:00
locale Updated English language files. 2014-10-16 23:28:02 +02:00
mediafile Refactory of the participant app 2014-10-12 10:06:54 +02:00
motion Merge branch 'stable/1.6.x' 2014-10-18 08:53:51 +02:00
poll Merge branch 'stable/1.6.x' 2014-10-18 08:53:51 +02:00
projector Use python3 2014-08-24 21:21:11 +02:00
users Merge branch 'stable/1.6.x' 2014-10-18 08:53:51 +02:00
utils Merge branch 'stable/1.6.x' 2014-10-18 08:53:51 +02:00
__init__.py Use python3 2014-08-24 21:21:11 +02:00
__main__.py Refactory of the participant app 2014-10-12 10:06:54 +02:00
global_settings.py Merge branch 'stable/1.6.x' 2014-10-18 08:53:51 +02:00
urls.py Refactory of the participant app 2014-10-12 10:06:54 +02:00