From: Louis Jeckel <louis.jeckel@outlook.com>
Date: Thu, 15 Oct 2020 13:17:01 +0000 (+0200)
Subject: Merge branch 'stripe' into master
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=9a80a76d438c34fb011b54a4049368468c294192;p=psq.git

Merge branch 'stripe' into master

# Conflicts:
#	public/admin/js/admin.js
#	public/js/app.js
---

9a80a76d438c34fb011b54a4049368468c294192