]> _ Git - psq.git/commitdiff
projects / psq.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 68aef41 97cf933)
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)
# Conflicts:
# public/admin/js/admin.js
# public/js/app.js


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.