OpenSlides/openslides/users
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
..
templates Update to bootstrap 3.3.1. 2015-01-21 12:23:32 +01:00
__init__.py Added Django's application configuration. 2014-12-10 17:16:58 +01:00
api.py Refactory of the participant app 2014-10-12 10:06:54 +02:00
apps.py Added api for assignments. 2015-01-17 22:46:23 +01:00
csv_import.py Use the new django transaction API 2014-10-19 10:52:48 +02:00
forms.py Merge branch 'stable/1.6.x' 2015-01-17 10:18:29 +01: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
pdf.py Merge branch 'stable/1.7.x' 2015-01-23 02:33:17 +01:00
search_indexes.py Refactory of the participant app 2014-10-12 10:06:54 +02:00
serializers.py Added api for assignments. 2015-01-17 22:46:23 +01:00
signals.py Refactored REST api in agenda, core and users app. 2015-01-17 15:58:51 +01:00
urls.py Refactory of the participant app 2014-10-12 10:06:54 +02:00
views.py Refactored REST api in agenda, core and users app. 2015-01-17 15:58:51 +01:00
widgets.py Refactory of the participant app 2014-10-12 10:06:54 +02:00