Merge remote-tracking branch 'origin/master' into staging-branch
Merge branch 'staging-branch' of gitlab.fokus.fraunhofer.de:jan-christopher.pien/django-testproject into staging-branch
Merge remote-tracking branch 'origin/master' into staging-branch
Re-commit settings
Re-commit setup
Merge remote-tracking branch 'origin/master' into staging-branch
Merge remote-tracking branch 'origin/master' into staging-branch
Merge remote-tracking branch 'origin/master' into staging-branch
Merge remote-tracking branch 'origin/master' into staging-branch
Beta 2
Merge remote-tracking branch 'origin/master' into staging-branch
Update local_settings
Merge remote-tracking branch 'origin/master' into staging-branch
Add comments to database settings
Update readme
Merge branch 'master' of gitlab.fokus.fraunhofer.de:jan-christopher.pien/django-testproject
Fix merge