ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
808aae597f
OpenSlides/openslides
History
Norman Jäckel 808aae597f Merge branch 'stable/1.6.x' into 'master'. 
Conflicts:
	CHANGELOG
	openslides/__init__.py
	openslides/assignment/views.py
2014-12-08 22:17:22 +01:00
..
account Use python3 2014-08-24 21:21:11 +02:00
agenda Use the new django transaction API 2014-10-19 10:52:48 +02:00
assignment Merge branch 'stable/1.6.x' into 'master'. 2014-12-08 22:17:22 +01:00
config Use python3 2014-08-24 21:21:11 +02:00
core Merge branch 'stable/1.6.x' 2014-10-18 08:53:51 +02:00
locale Updated FR translation. 2014-10-27 20:42:36 +01:00
mediafile Refactory of the participant app 2014-10-12 10:06:54 +02:00
motion Use the new django transaction API 2014-10-19 10:52:48 +02:00
poll Merge branch 'stable/1.6.x' 2014-10-18 08:53:51 +02:00
projector Use python3 2014-08-24 21:21:11 +02:00
users Use the new django transaction API 2014-10-19 10:52:48 +02:00
utils Merge branch 'stable/1.6.x' 2014-10-18 08:53:51 +02: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