ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
dcd8b7a639
OpenSlides/openslides
History
Norman Jäckel dcd8b7a639 Merge branch 'stable/1.6.x' into 'master'. 
Conflicts:
	CHANGELOG
	openslides/agenda/views.py
	openslides/assignment/views.py
	openslides/mediafile/views.py
	openslides/users/views.py
	openslides/utils/views.py
	tests/motion/test_pdf.py
	tests/settings.py
2015-01-02 22:11:56 +01:00
..
account Added Django's application configuration. 2014-12-10 17:16:58 +01:00
agenda Merge branch 'stable/1.6.x' into 'master'. 2015-01-02 22:11:56 +01:00
assignment Merge branch 'stable/1.6.x' into 'master'. 2015-01-02 22:11:56 +01:00
config Added Django's application configuration. 2014-12-10 17:16:58 +01:00
core Added Django's application configuration. 2014-12-10 17:16:58 +01:00
locale Updated FR translation. 2014-10-27 20:42:36 +01:00
mediafile Merge branch 'stable/1.6.x' into 'master'. 2015-01-02 22:11:56 +01:00
motion Merge branch 'stable/1.6.x' into 'master'. 2015-01-02 22:11:56 +01:00
poll Merge branch 'stable/1.6.x' into 'master'. 2015-01-02 22:11:56 +01:00
projector Added Django's application configuration. 2014-12-10 17:16:58 +01:00
users Merge branch 'stable/1.6.x' into 'master'. 2015-01-02 22:11:56 +01:00
utils Merge branch 'stable/1.6.x' into 'master'. 2015-01-02 22:11:56 +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' 2014-10-18 08:53:51 +02:00
urls.py Refactory of the participant app 2014-10-12 10:06:54 +02:00