OpenSlides/openslides/mediafile
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
..
static Updated pdf.js to 1.0.907 2015-01-16 22:16:31 +01:00
templates Improved html templates for mobile devices (responsive). 2014-05-18 22:19:02 +02:00
__init__.py Added Django's application configuration. 2014-12-10 17:16:58 +01:00
apps.py Added Django's application configuration. 2014-12-10 17:16:58 +01:00
forms.py Use python3 2014-08-24 21:21:11 +02:00
main_menu.py Use python3 2014-08-24 21:21:11 +02:00
models.py Refactory of the participant app 2014-10-12 10:06:54 +02:00
search_indexes.py Use python3 2014-08-24 21:21:11 +02:00
slides.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.6.x' into 'master'. 2015-01-02 22:11:56 +01:00
widgets.py Use python3 2014-08-24 21:21:11 +02:00