From 058a3c551d9b3402bef9ebf89151e20e4897e080 Mon Sep 17 00:00:00 2001
From: Patrick McDermott <pehjota>
Date: Sat, 23 Mar 2019 14:43:35 -0400
Subject: Merge remote-tracking branch 'origin/master'

Conflicts:
	dev/archive/signing.mdwn
---
(limited to 'media/oca-64/download-arrow.svg')

--
cgit v0.9.1