OpenSlides/openslides
Emanuel Schuetze 4ae7f3e243 Merge remote branch 'upstream/master' into newtemplate
Conflicts:
	openslides/application/views.py
	openslides/assignment/templates/assignment/overview.html
	openslides/assignment/templates/assignment/view.html
	openslides/assignment/views.py
	openslides/locale/de/LC_MESSAGES/django.mo
	openslides/locale/de/LC_MESSAGES/django.po
	openslides/motion/templates/motion/config.html
	openslides/motion/templates/motion/edit.html
	openslides/motion/templates/motion/import.html
	openslides/motion/templates/motion/overview.html
	openslides/motion/templates/motion/poll_view.html
	openslides/motion/templates/motion/view.html
	openslides/participant/templates/participant/base_participant.html
	openslides/participant/templates/participant/config.html
	openslides/participant/templates/participant/group_edit.html
	openslides/participant/templates/participant/group_overview.html
	openslides/participant/templates/participant/overview.html
	openslides/projector/templates/projector/base_projector.html
	openslides/projector/templates/projector/dashboard.html
	openslides/projector/templates/projector/live_view_widget.html
	openslides/static/styles/base.css
	openslides/templates/base.html
	openslides/templates/front_page.html
	openslides/utils/utils.py
2013-01-02 23:01:43 +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 Merge remote branch 'upstream/master' into newtemplate 2013-01-02 23:01:43 +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 Merge remote branch 'upstream/master' into newtemplate 2013-01-02 23:01:43 +01:00
static Merge remote branch 'upstream/master' into newtemplate 2013-01-02 23:01:43 +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