Raymond Yee 4ab64c2a68 Merge branch 'master' into pledge_pretty_stick_merge ... Conflicts: frontend/templates/faq_pledge.html static/css/sitewide.css static/less/sitewide.less I took frontend/templates/faq_pledge.html from master. I combined less/css to have def'n of both .central and li.checked		2012-10-10 16:46:11 -07:00
..
templates	Merge branch 'master' into pledge_pretty_stick_merge	2012-10-10 16:46:11 -07:00
templatetags	Added language filtering [finish #24232285]	2012-07-21 16:26:16 -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 pledge_pretty_stick_merge	2012-10-10 16:46:11 -07: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	Revert "Revert "slowly progressing on PledgeUiTest""	2012-10-10 13:59:04 -07:00
urls.py	Merge pull request #12 from Gluejar/master	2012-09-24 09:07:44 -07:00
views.py	Merge branch 'master' into pledge_pretty_stick_merge	2012-10-10 16:46:11 -07:00