Skip to content
Snippets Groups Projects
Commit 5af9f95a authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

Merge branch '315-conflicting-migrations-detected' into 'master' 

Resolve "Conflicting migrations detected"

Closes #315

See merge request AlekSIS/official/AlekSIS!382
parents d8cc3412 77f8b742
No related branches found
No related tags found
Checking pipeline status
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment