Emanuel Schuetze d671740966 Fixed merged errors.		2013-01-02 23:22:12 +01:00
..
agenda	Merge remote branch 'upstream/master' into newtemplate	2013-01-02 23:01:43 +01:00
assignment	Merge remote branch 'upstream/master' into newtemplate	2013-01-02 23:01:43 +01:00
config	Merge remote branch 'upstream/master' into newtemplate	2013-01-02 23:01:43 +01:00
locale	Merge remote branch 'upstream/master' into newtemplate	2013-01-02 23:01:43 +01:00
motion	Fixed merged errors.	2013-01-02 23:22:12 +01:00
participant	Merge remote branch 'upstream/master' into newtemplate	2013-01-02 23:01:43 +01:00
poll	cleanup	2012-11-24 14:01:21 +01:00
projector	Fixed merged errors.	2013-01-02 23:22:12 +01:00
static	Fixed merged errors.	2013-01-02 23:22:12 +01:00
templates	Merge remote branch 'upstream/master' into newtemplate	2013-01-02 23:01:43 +01:00
utils	Merge remote branch 'upstream/master' into newtemplate	2013-01-02 23:01:43 +01:00
__init__.py	Changed Version to 1.4.dev	2012-12-14 14:14:01 +01:00
global_settings.py	Merge branch 'master' into Version_String	2012-11-28 17:54:29 +01:00
main.py	Added a new command to the startscript to show the version	2012-11-29 15:01:49 +01:00
urls.py	cleanup	2012-11-24 14:01:21 +01:00