Norman Jäckel 589c209c79 Merge branch 'master' into Version_String ... Conflicts: openslides/__init__.py openslides/config/views.py		2012-11-28 17:54:29 +01:00
..
agenda	reordered the tests	2012-11-24 15:00:17 +01:00
assignment	Reverted person.sort_name AttributeError fix (e0ce1052c0)	2012-11-27 22:54:07 +01:00
config	Merge branch 'master' into Version_String	2012-11-28 17:54:29 +01:00
locale	Updated translations	2012-11-27 21:30:45 +01:00
motion	Updated translation msg strings.	2012-11-27 21:22:57 +01:00
participant	Merge pull request #61 from ostcar/master	2012-11-28 05:16:10 -08:00
poll	cleanup	2012-11-24 14:01:21 +01:00
projector	Added more tests for the agenda	2012-11-26 10:05:51 +01:00
static	Enlarged users select box in new/edit group form.	2012-11-21 22:06:22 +01:00
templates	Updated translation for professional support footer.	2012-11-19 23:05:38 +01:00
utils	Merge branch 'master' into Version_String	2012-11-28 17:54:29 +01:00
__init__.py	Fix get_version, insert and use get_git_commit_id.	2012-11-23 11:31:30 +01:00
global_settings.py	Merge branch 'master' into Version_String	2012-11-28 17:54:29 +01:00
main.py	Load groups_de when creating the database	2012-11-25 01:07:39 +01:00
urls.py	cleanup	2012-11-24 14:01:21 +01:00