OpenSlides/openslides/core
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
..
management Use python3 2014-08-24 21:21:11 +02:00
static Update to bootstrap 3.3.1. 2015-01-21 12:23:32 +01:00
templates Update to bootstrap 3.3.1. 2015-01-21 12:23:32 +01:00
templatetags Use python3 2014-08-24 21:21:11 +02:00
__init__.py Added Django's application configuration. 2014-12-10 17:16:58 +01:00
apps.py Added api for assignments. 2015-01-17 22:46:23 +01:00
chatbox.py Merge branch 'stable/1.7.x' 2015-01-23 02:33:17 +01:00
exceptions.py Merge branch 'stable/1.6.x' 2015-01-06 13:04:07 +01:00
forms.py Use python3 2014-08-24 21:21:11 +02:00
main_menu.py Update to bootstrap 3.3.1. 2015-01-21 12:23:32 +01:00
models.py Refactored REST api in agenda, core and users app. 2015-01-17 15:58:51 +01:00
serializers.py Refactored REST api in agenda, core and users app. 2015-01-17 15:58:51 +01:00
signals.py remove update_projector and add inform_changed_data 2015-01-17 15:16:49 +01:00
urls.py Merge branch 'stable/1.6.x' 2015-01-06 13:04:07 +01:00
views.py Merge pull request #1411 from boehlke/master 2015-01-18 09:07:24 +01:00
widgets.py Added Django's application configuration. 2014-12-10 17:16:58 +01:00