Oskar Hahn 5c6f7a41a8 Merge branch 'stable/1.6.x' ... Conflicts: tests/assignment/test_views.py		2014-10-18 08:53:51 +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
api.py	Refactory of the participant app	2014-10-12 10:06:54 +02:00
csv_import.py	Merge branch 'stable/1.6.x'	2014-10-18 08:53:51 +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	Refactory of the participant app	2014-10-12 10:06:54 +02:00
slides.py	Refactory of the participant app	2014-10-12 10:06:54 +02:00
urls.py	Refactory of the participant app	2014-10-12 10:06:54 +02:00
views.py	Refactory of the participant app	2014-10-12 10:06:54 +02:00
widgets.py	Refactory of the participant app	2014-10-12 10:06:54 +02:00