ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
0a24b7267b
OpenSlides/openslides/core
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
..
management Use python3 2014-08-24 21:21:11 +02:00
static Used Bower and gulp to manage third party JavaScript and Cascading Style Sheets libraries. 2015-01-17 00:12:04 +01:00
templates Merge branch 'stable/1.6.x' 2015-01-17 10:18:29 +01:00
templatetags Use python3 2014-08-24 21:21:11 +02:00
__init__.py Added Django's application configuration. 2014-12-10 17:16:58 +01:00
apps.py Added api viewset for custom slides. 2015-01-17 08:51:54 +01:00
chatbox.py Merge branch 'stable/1.6.x' 2015-01-17 10:18:29 +01:00
exceptions.py Merge branch 'stable/1.6.x' 2015-01-06 13:04:07 +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 Merge branch 'stable/1.6.x' 2015-01-06 13:04:07 +01:00
serializers.py Added api viewset for custom slides. 2015-01-17 08:51:54 +01:00
signals.py Added Django's application configuration. 2014-12-10 17:16:58 +01:00
urls.py Merge branch 'stable/1.6.x' 2015-01-06 13:04:07 +01:00
views.py Added api viewset for custom slides. 2015-01-17 08:51:54 +01:00
widgets.py Added Django's application configuration. 2014-12-10 17:16:58 +01:00