Merge branch 'fake-data-subscriptions-and-payments' of https://github… · gratipay/gratipay.com@a571f98 · GitHub

This repository has been archived by the owner on Feb 8, 2018. It is now read-only.

Commit

Merge branch 'fake-data-subscriptions-and-payments' of https://github…

Browse files

….com/gratipay/gratipay.com into fake-data-subscriptions-and-payments

Conflicts:
	gratipay/utils/fake_data.py
	tests/py/test_fake_data.py

Loading branch information

kaguillera committed Sep 16, 2016

2 parents 961c720 + 5913628 commit a571f98