Raymond Yee 46d1d4f767 Merge branch 'master' into expiring_cc ... Conflicts: payment/models.py payment/tests.py		2013-07-08 10:52:44 -07:00
..
templates	Merge branch 'master' into expiring_cc	2013-07-08 10:52:44 -07:00
templatetags	PEP 8, PEP 328. I feel better now.	2013-06-03 12:31:39 -04:00
__init__.py	setup api, core and frontend apps, also added initial homepage template from stefan	2011-08-30 23:46:55 -04:00
forms.py	Merge branch 'master' into simpler_download	2013-06-04 10:48:49 -04:00
models.py	setup api, core and frontend apps, also added initial homepage template from stefan	2011-08-30 23:46:55 -04:00
tests.py	PEP 8, PEP 328. I feel better now.	2013-06-03 12:31:39 -04:00
urls.py	segregate flows of one-click and information-seeking options, address feedback	2013-06-24 13:53:28 -04:00
views.py	exclude google books, align error message with page text	2013-07-05 09:05:26 -04:00