Rebecca Law aff948e9ca Merge branch 'celery-send-sms-code' into celery-send-email-code ...

Conflicts:
	app/celery/tasks.py
	app/user/rest.py
	scripts/run_celery.sh

2016-02-18 10:50:14 +00:00

..

app

Merge branch 'celery-send-sms-code' into celery-send-email-code

2016-02-18 10:50:14 +00:00

__init__.py

bumped client version

2016-02-09 18:48:02 +00:00

conftest.py

I have an issue with the test, not sure why?

2016-02-17 17:48:23 +00:00