Norman Jäckel 78077e4ab1 Fix syntax and style errors and errors after deficient merge conflic ... resolving after branch merging.		2014-04-08 21:02:09 +02:00
..
account	Inserted api for the personal info widget.	2013-12-09 12:16:16 +01:00
agenda	Merge part of stable/1.5.x into master.	2014-04-05 15:19:42 +02:00
assignment	Merge commit '7addd69050a69b9d02aacba116939829497ca338' into MergeStablePart2	2014-04-07 22:35:52 +02:00
config	Inserted command line option to translate config strings during database setup. Fixed #460.	2014-01-31 02:03:43 +01:00
core	Fix syntax and style errors and errors after deficient merge conflic	2014-04-08 21:02:09 +02:00
locale	Update translation files, fix translation for dataTables, update footer.	2014-03-31 23:07:42 +02:00
mediafile	Fix syntax and style errors and errors after deficient merge conflic	2014-04-08 21:02:09 +02:00
motion	Merge part of stable/1.5.x into master.	2014-04-08 20:33:07 +02:00
participant	Merge part of stable/1.5.x into master.	2014-04-08 20:33:07 +02:00
poll	Added a poll description field for each assignment poll	2014-01-12 10:22:38 +01:00
projector	Merge remote-tracking branch 'openslides/stable/1.5.x'	2014-03-12 19:29:22 +01:00
utils	Fix syntax and style errors and errors after deficient merge conflic	2014-04-08 21:02:09 +02:00
__init__.py	Update version to 1.6a1-dev.	2013-11-25 23:42:52 +01:00
__main__.py	Inserted command line option to translate config strings during database setup. Fixed #460.	2014-01-31 02:03:43 +01:00
global_settings.py	Used entry points to detect plugins automaticly.	2014-01-12 12:48:24 +01:00
urls.py	Changes in projector and core app and in utils.	2014-01-10 16:17:54 +01:00