Skip to content
Snippets Groups Projects
Commit 3b278315 authored by Tobias Jülg's avatar Tobias Jülg
Browse files

Merge branch 'master' into helppage

# Conflicts:
#	management/templates/management/base.html
#	vote/views.py
parents b72db31e 69dd97ed
No related branches found
No related tags found
Loading
Showing
with 3326 additions and 169 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment