Oskar Hahn 8b88d38ac5 Merge branch 'stable/1.7.x' ... Conflicts: openslides/__init__.py openslides/assignment/views.py openslides/motion/pdf.py openslides/users/pdf.py		2015-01-23 02:33:17 +01:00
..
account	Added Django's application configuration.	2014-12-10 17:16:58 +01:00
agenda	Merge branch 'stable/1.7.x'	2015-01-23 02:33:17 +01:00
assignment	Merge branch 'stable/1.7.x'	2015-01-23 02:33:17 +01:00
config	Update to bootstrap 3.3.1.	2015-01-21 12:23:32 +01:00
core	Merge branch 'stable/1.7.x'	2015-01-23 02:33:17 +01:00
locale	Updated translations (DE, FR, CS, PT) for 1.7.	2015-01-21 15:59:27 +01:00
mediafile	Update to bootstrap 3.3.1.	2015-01-21 12:23:32 +01:00
motion	Merge branch 'stable/1.7.x'	2015-01-23 02:33:17 +01:00
poll	Merge branch 'stable/1.6.x' into 'master'.	2015-01-02 22:11:56 +01:00
projector	remove update_projector and add inform_changed_data	2015-01-17 15:16:49 +01:00
users	Merge branch 'stable/1.7.x'	2015-01-23 02:33:17 +01:00
utils	Refactored REST api in agenda, core and users app.	2015-01-17 15:58:51 +01:00
__init__.py	Updated version to 1.7	2015-01-21 20:58:03 +01:00
__main__.py	remove update_projector and add inform_changed_data	2015-01-17 15:16:49 +01:00
global_settings.py	remove update_projector and add inform_changed_data	2015-01-17 15:16:49 +01:00
urls.py	Setup Django REST Framework.	2015-01-17 08:49:52 +01:00