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
..
static	Fixed #1158 (Clean up assignment.css)	2014-05-17 21:15:46 +02: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
apps.py	Added api for assignments.	2015-01-17 22:46:23 +01:00
forms.py	Refactory of the participant app	2014-10-12 10:06:54 +02:00
main_menu.py	Update to bootstrap 3.3.1.	2015-01-21 12:23:32 +01:00
models.py	Added api for assignments.	2015-01-17 22:46:23 +01:00
personal_info.py	Use python3	2014-08-24 21:21:11 +02:00
search_indexes.py	Use python3	2014-08-24 21:21:11 +02:00
serializers.py	Added api for assignments.	2015-01-17 22:46:23 +01:00
signals.py	Added Django's application configuration.	2014-12-10 17:16:58 +01:00
template.py	Added Django's application configuration.	2014-12-10 17:16:58 +01:00
urls.py	Use python3	2014-08-24 21:21:11 +02:00
views.py	Merge branch 'stable/1.7.x'	2015-01-23 02:33:17 +01:00
widgets.py	Use python3	2014-08-24 21:21:11 +02:00