Skip to content
Snippets Groups Projects
Commit 35380690 authored by Hamer Iboshi's avatar Hamer Iboshi
Browse files

Merge branch 'master' into development

parents 68c1cd91 c3bd14a4
No related branches found
No related tags found
1 merge request!1Update settings.py
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment