eric 3661faec0a Merge remote-tracking branch 'Gluejar/master' into catchup ... # Conflicts: # core/models/__init__.py # core/models/bibmodels.py # vagrant/host_vars/prod/secrets.yml		2018-05-23 13:56:27 -04:00
..
forms	Merge remote-tracking branch 'Gluejar/master' into catchup	2018-05-23 13:56:27 -04:00
templates	Merge remote-tracking branch 'Gluejar/master' into catchup	2018-05-23 13:56:27 -04:00
templatetags	Merge remote-tracking branch 'Gluejar/master' into dj111	2018-04-25 16:23:00 -04:00
views	Merge remote-tracking branch 'Gluejar/master' into catchup	2018-05-23 13:56:27 -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
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	rip out dead code	2018-04-19 12:24:34 -04:00
urls.py	Merge remote-tracking branch 'Gluejar/master' into catchup	2018-05-23 13:56:27 -04:00