projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 034ac43 2f74018)
Merge branch 'develop' into feature/account-export
authorMark Felder <feld@FreeBSD.org>
Tue, 27 Oct 2020 17:51:31 +0000 (12:51 -0500)
committerMark Felder <feld@FreeBSD.org>
Tue, 27 Oct 2020 17:51:31 +0000 (12:51 -0500)
1  2 
CHANGELOG.md patch | diff1 | diff2 | blob | history
config/config.exs patch | diff1 | diff2 | blob | history

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