Adam Shimali fcedae5fe1 Merge conflicts and test fixes

2016-01-20 15:40:06 +00:00

..

app

Merge conflicts and test fixes

2016-01-20 15:40:06 +00:00

__init__.py

User registration now creates user via api.

2016-01-19 22:49:46 +00:00

conftest.py

Verify activate and login user with sms and email code

2016-01-20 15:34:42 +00:00