ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
0a24b7267b
OpenSlides/openslides/motion
History
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/css New poll slides for motion and assignment. (Fixed #862) 2014-05-02 23:40:23 +02:00
templates Fixed missing translation strings. 2015-01-16 14:25:34 +01: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
csv_import.py Use the new django transaction API 2014-10-19 10:52:48 +02:00
exceptions.py Use python3 2014-08-24 21:21:11 +02:00
forms.py Merge branch 'stable/1.6.x' 2015-01-06 13:04:07 +01:00
main_menu.py Use python3 2014-08-24 21:21:11 +02:00
models.py Merge branch 'stable/1.6.x' 2015-01-06 13:04:07 +01:00
pdf.py Merge branch 'stable/1.6.x' into 'master'. 2015-01-02 22:11:56 +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
signals.py Merge branch 'stable/1.6.x' 2015-01-17 10:18:29 +01:00
urls.py Merge branch 'stable/1.6.x' 2015-01-06 13:04:07 +01:00
views.py Merge branch 'stable/1.6.x' 2015-01-06 13:04:07 +01:00
widgets.py Use python3 2014-08-24 21:21:11 +02:00