Jan Kuparinen ff709c7731 Fix conflicts		2021-01-26 07:28:44 +02:00
..
assets/images
pages	Fix conflicts	2021-01-26 07:28:44 +02:00
nav.adoc	remove an errant ' and fix capitalization	2021-01-15 12:04:18 -05:00