ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
86261bda28
OpenSlides/openslides
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
..
account Added Django's application configuration. 2014-12-10 17:16:58 +01:00
agenda Merge branch 'stable/1.6.x' 2015-01-17 10:18:29 +01:00
assignment Merge branch 'stable/1.6.x' 2015-01-17 10:18:29 +01:00
config Merge branch 'stable/1.6.x' 2015-01-06 13:04:07 +01:00
core Merge branch 'stable/1.6.x' 2015-01-17 10:18:29 +01:00
locale Fixed missing translation strings. 2015-01-16 14:25:34 +01:00
mediafile Merge branch 'stable/1.6.x' 2015-01-17 10:18:29 +01:00
motion Merge branch 'stable/1.6.x' 2015-01-17 10:18:29 +01:00
poll Merge branch 'stable/1.6.x' into 'master'. 2015-01-02 22:11:56 +01:00
projector Merge branch 'stable/1.6.x' 2015-01-17 10:18:29 +01:00
users Merge branch 'stable/1.6.x' 2015-01-17 10:18:29 +01:00
utils Merge branch 'stable/1.6.x' 2015-01-17 10:18:29 +01:00
__init__.py Update version to 1.6.2-dev 2014-12-04 15:47:21 +01:00
__main__.py Use the new django transaction API 2014-10-19 10:52:48 +02:00
global_settings.py Merge branch 'stable/1.6.x' 2015-01-17 10:18:29 +01:00
urls.py Setup Django REST Framework. 2015-01-17 08:49:52 +01:00