Commit e2a552db authored by astavrak's avatar astavrak
Browse files

merge lexi's branch

parent cb866a4b
<<<<<<< HEAD
{"username": "gmail@gmail.com", "userType": "Family&Friends"}
\ No newline at end of file
=======
{"username": "a", "userType": ""}
>>>>>>> lexi_omega
Supports Markdown
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