]> _ Git - psq.git/commit
Merge branch 'stripe' into master
authorLouis Jeckel <louis.jeckel@outlook.com>
Thu, 15 Oct 2020 13:17:01 +0000 (15:17 +0200)
committerLouis Jeckel <louis.jeckel@outlook.com>
Thu, 15 Oct 2020 13:17:01 +0000 (15:17 +0200)
commit9a80a76d438c34fb011b54a4049368468c294192
tree435c7a8398c6ad06a742ccd1db1ab92074206195
parent68aef419f6d1d5a34df02d2662a1ad89b34a69c4
parent97cf9332e98b4e41097b682376c7bff2b30b176d
Merge branch 'stripe' into master

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