OpenSlides/openslides/users
Norman Jäckel dcd8b7a639 Merge branch 'stable/1.6.x' into 'master'.
Conflicts:
	CHANGELOG
	openslides/agenda/views.py
	openslides/assignment/views.py
	openslides/mediafile/views.py
	openslides/users/views.py
	openslides/utils/views.py
	tests/motion/test_pdf.py
	tests/settings.py
2015-01-02 22:11:56 +01:00
..
templates Refactory of the participant app 2014-10-12 10:06:54 +02: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 Django's application configuration. 2014-12-10 17:16:58 +01:00
csv_import.py Use the new django transaction API 2014-10-19 10:52:48 +02:00
forms.py Updated Django to 1.7.x 2014-10-14 17:14:52 +02: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
signals.py Added Django's application configuration. 2014-12-10 17:16:58 +01:00
urls.py Refactory of the participant app 2014-10-12 10:06:54 +02:00
views.py Merge branch 'stable/1.6.x' into 'master'. 2015-01-02 22:11:56 +01:00
widgets.py Refactory of the participant app 2014-10-12 10:06:54 +02:00