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
..
__init__.py	merge newfoundation	2018-04-24 20:28:23 -04:00
bibforms.py	error should not be thrown if duplicate id is already the id	2018-05-10 21:45:56 -04:00
rh_forms.py	rip out dead code	2018-04-19 12:24:34 -04:00