eric fafd37a973 Merge branch 'master' into marc_package ... Conflicts: core/marc.py static/css/campaign2.css		2014-10-30 12:38:53 -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
common.py	Merge branch 'master' into marc_package	2014-10-30 12:38:53 -04:00
dev.py	Make sure current staff is described accurately on ungluue.it site	2013-08-01 19:28:20 -04:00
jenkins.py	Setting up jenkins-unglueit S3 bucket for jenkins	2014-02-19 15:24:23 -08:00
just.py	Turn on a daily test email from production and just -- to give RY some daily ping about celerybeat	2014-10-10 12:39:43 -07:00
please.py	First pass at trying to fix problems in pip install -r requirements	2014-10-16 15:12:34 -07:00
prod.py	Turn on a daily test email from production and just -- to give RY some daily ping about celerybeat	2014-10-10 12:39:43 -07:00