OpenSlides/openslides/users
Oskar Hahn 0a24b7267b Merge branch 'stable/1.6.x'
Conflicts:
	CHANGELOG
	README.rst
	openslides/assignment/models.py
	openslides/users/forms.py
	requirements_production.txt
	tests/settings.py
2015-01-17 10:18:29 +01:00
..
templates Merge branch 'stable/1.6.x' 2015-01-06 13:04:07 +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 viewset for users. 2015-01-17 08:51:57 +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 Refactory of the participant app 2014-10-12 10:06:54 +02:00
models.py Refactory of the participant app 2014-10-12 10:06:54 +02:00
pdf.py Refactory of the participant app 2014-10-12 10:06:54 +02:00
search_indexes.py Refactory of the participant app 2014-10-12 10:06:54 +02:00
serializers.py Added api viewset for users. 2015-01-17 08:51:57 +01:00
signals.py Merge branch 'stable/1.6.x' 2015-01-06 13:04:07 +01:00
urls.py Refactory of the participant app 2014-10-12 10:06:54 +02:00
views.py Added api viewset for users. 2015-01-17 08:51:57 +01:00
widgets.py Refactory of the participant app 2014-10-12 10:06:54 +02:00