Skip to content
Snippets Groups Projects
Commit 00154783 authored by Krish Moodbidri's avatar Krish Moodbidri
Browse files

merge auto-conflict on app/__init__.py

parent ff481fa2
No related branches found
No related tags found
2 merge requests!21Feat certify account,!18WIP: Feat-account-renewal
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