Aaron 43ee574899 Merge branch 'develop' into admin-users ... # Conflicts: # backend/grant/admin/views.py		2019-02-21 18:44:58 -06:00
..
admin	fix tests and add 2fa setup flow test	2019-02-21 18:39:41 -06:00
email	Run reformatter on all files (#98)	2019-01-23 10:00:30 -05:00
proposal	Fix stake confirmed test.	2019-02-21 13:43:20 -05:00
task	fix test	2019-01-29 16:43:04 -06:00
user	fix tests and add 2fa setup flow test	2019-02-21 18:39:41 -06:00
__init__.py	"Fuller" Users (#96)	2018-09-25 15:09:25 -05:00
config.py	Fix stake confirmed test.	2019-02-21 13:43:20 -05:00
factories.py	Run reformatter on all files (#98)	2019-01-23 10:00:30 -05:00
mocks.py	Run reformatter on all files (#98)	2019-01-23 10:00:30 -05:00
settings.py	User Auth Conversion (#19)	2018-12-14 13:36:22 -06:00
test_data.py	Fix parser error by parsing unix with 'datetime' instead of dateutil	2019-02-08 15:12:44 -05:00
test_example.py	Run reformatter on all files (#98)	2019-01-23 10:00:30 -05:00
test_models.py	initial commit	2018-09-10 11:55:26 -05:00