Chris Veilleux c851624256 Merge remote-tracking branch 'remotes/origin/dev' into add-device ... # Conflicts: # api/account/account_api/api.py # api/account/tests/features/steps/update_membership.py # shared/selene/api/endpoints/account.py # shared/selene/data/account/repository/sql/get_active_membership_by_account_id.sql		2019-03-18 17:05:08 -05:00
..
selene	Merge remote-tracking branch 'remotes/origin/dev' into add-device	2019-03-18 17:05:08 -05:00
Dockerfile	moved the contents of the "backend" directory up one level since this repo is now just for backend code	2019-01-30 14:47:18 -06:00
MANIFEST.in	fixing typo	2019-02-07 18:09:34 -03:00
Pipfile	Starting to implement the stripe integration	2019-03-15 11:07:12 -03:00
Pipfile.lock	Starting to implement the stripe integration	2019-03-15 11:07:12 -03:00
setup.py	removed validtor-collection from requirements	2019-02-20 17:34:59 -06:00