5 commits

Author	SHA1	Message	Date
zadam	5114f3f782	fixes after merge	2020-03-08 09:38:49 +01:00
zadam	53f5df4e88	Merge remote-tracking branch 'origin/stable' ... # Conflicts: # src/public/javascripts/desktop.js # src/public/stylesheets/style.css # src/views/details/image.ejs # src/views/details/relation_map.ejs	2020-03-08 09:26:34 +01:00
zadam	e4039ea5e1	fixed printing relation map	2020-03-08 09:24:03 +01:00
zadam	95fef8d2e5	fixes after merge	2020-03-07 22:29:49 +01:00
zadam	0d9cdcac85	load appropriate styles for printing book notes, closes #899	2020-03-07 22:01:34 +01:00