OpenSlides/openslides/assignment
Norman Jäckel 808aae597f Merge branch 'stable/1.6.x' into 'master'.
Conflicts:
	CHANGELOG
	openslides/__init__.py
	openslides/assignment/views.py
2014-12-08 22:17:22 +01:00
..
static Fixed #1158 (Clean up assignment.css) 2014-05-17 21:15:46 +02:00
templates Refactory of the participant app 2014-10-12 10:06:54 +02:00
__init__.py Refactory of the participant app 2014-10-12 10:06:54 +02:00
forms.py Refactory of the participant app 2014-10-12 10:06:54 +02:00
main_menu.py Use python3 2014-08-24 21:21:11 +02:00
models.py Updated Django to 1.7.x 2014-10-14 17:14:52 +02: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
signals.py Use python3 2014-08-24 21:21:11 +02:00
slides.py Use python3 2014-08-24 21:21:11 +02:00
template.py Use python3 2014-08-24 21:21:11 +02:00
urls.py Use python3 2014-08-24 21:21:11 +02:00
views.py Merge branch 'stable/1.6.x' into 'master'. 2014-12-08 22:17:22 +01:00
widgets.py Use python3 2014-08-24 21:21:11 +02:00