eric 84da8bde94 Merge remote-tracking branch 'Gluejar/master' ... # Conflicts: # frontend/views/__init__.py # questionnaire/admin.py # questionnaire/urls.py # questionnaire/utils.py # questionnaire/views.py		2017-08-21 12:02:48 -04:00
..
__init__.py	Merge remote-tracking branch 'Gluejar/master'	2017-08-21 12:02:48 -04:00
bibedit.py	add ebook activation on edition edit	2017-08-08 12:39:23 -04:00