Merge branch 'testing'

author Stephen Frost <[email protected]>

Thu, 3 Oct 2019 13:42:32 +0000 (09:42 -0400)

committer Stephen Frost <[email protected]>

Thu, 3 Oct 2019 13:42:32 +0000 (09:42 -0400)
author Stephen Frost <[email protected]>
Thu, 3 Oct 2019 13:42:32 +0000 (09:42 -0400)
committer Stephen Frost <[email protected]>
Thu, 3 Oct 2019 13:42:32 +0000 (09:42 -0400)
diff --cc template/base.html
Simple merge
diff --cc template/base_pgdu.html
Simple merge
author	Stephen Frost <[email protected]>
	Thu, 3 Oct 2019 13:42:32 +0000 (09:42 -0400)
committer	Stephen Frost <[email protected]>
	Thu, 3 Oct 2019 13:42:32 +0000 (09:42 -0400)
		1	2
template/base.html	patch \|	diff1 \|	diff2 \|	blob \| history
template/base_pgdu.html	patch \|	diff1 \|	diff2 \|	blob \| history