ange 83babb19f3 fix conflicts		2018-06-11 13:38:23 +02:00
..
static	fix conflicts	2018-06-11 13:38:23 +02:00
templates	fix conflicts	2018-06-11 13:38:23 +02:00
__init__.py	fix conflicts	2018-06-11 13:38:23 +02:00
cover.py	Import csv works! Many to many books and authors is also nice	2018-05-23 17:02:06 +02:00
forms.py	Merge branch 'stack_stuff' of git.xpub.nl:/var/www/git.xpub.nl/repos/xpub-lib into stack_stuff	2018-06-11 12:00:53 +02:00
getannot.py	Add stuff to xpplannot	2018-06-11 13:32:18 +02:00
models.py	Merge branch 'stack_stuff' of git.xpub.nl:/var/www/git.xpub.nl/repos/xpub-lib into stack_stuff	2018-06-11 12:00:53 +02:00
test.txt	Add stuff to xpplannot	2018-06-11 13:32:18 +02:00
views.py	fix conflicts	2018-06-11 13:38:23 +02:00