Emanuel Schuetze 13cd52bd96 Merged (conflicts).		2013-01-05 15:29:57 +01:00
..
agenda	Merged (conflicts).	2013-01-05 15:29:57 +01:00
assignment	Merged (conflicts).	2013-01-05 15:29:57 +01:00
config	Merged (conflicts).	2013-01-05 15:29:57 +01:00
locale	Merge remote branch 'upstream/master' into newtemplate	2013-01-02 23:01:43 +01:00
motion	Merged (conflicts).	2013-01-05 15:29:57 +01:00
participant	Merged (conflicts).	2013-01-05 15:29:57 +01:00
poll	cleanup	2012-11-24 14:01:21 +01:00
projector	Merged (conflicts).	2013-01-05 15:29:57 +01:00
static	Fixed merged errors.	2013-01-02 23:22:12 +01:00
templates	Merged (conflicts).	2013-01-05 15:29:57 +01:00
utils	Merged (conflicts).	2013-01-05 15:29:57 +01:00
__init__.py	Merged (conflicts).	2013-01-05 15:29:57 +01:00
global_settings.py	Merged (conflicts).	2013-01-05 15:29:57 +01:00
main.py	Merged (conflicts).	2013-01-05 15:29:57 +01:00
urls.py	cleanup	2012-11-24 14:01:21 +01:00