projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7c0ac54 be27777)
Merge branch 'develop' into feature/new-registrations-digest
authorMark Felder <feld@FreeBSD.org>
Wed, 22 Jan 2020 21:59:24 +0000 (15:59 -0600)
committerMark Felder <feld@FreeBSD.org>
Wed, 22 Jan 2020 21:59:24 +0000 (15:59 -0600)
1  2 
config/config.exs patch | diff1 | diff2 | blob | history

diff --cc config/config.exs
Simple merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git