Skip to content
Snippets Groups Projects
Commit 321186fb authored by Phil Höfer's avatar Phil Höfer
Browse files

Merge branch 'development' into '1021-new-donate-site'

# Conflicts:
#   resources/views/index.blade.php
parents 8c5ab180 db05fa3e
No related branches found
No related tags found
Loading
Showing
with 390 additions and 226 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