Commit 8117eb1c authored by Krish Moodbidri's avatar Krish Moodbidri
Browse files

Merge remote-tracking branch 'origin/mr/41' into feat-variable-consistency

Conflicts:
	app/__init__.py
	app/templates/account/certify.html
parents 59e3f68f f2fad2fe
Pipeline #6145 failed with stage