projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 96493da d772361)
Merge branch 'develop' into issue/1855
authorMark Felder <feld@FreeBSD.org>
Wed, 17 Jun 2020 17:50:06 +0000 (12:50 -0500)
committerMark Felder <feld@FreeBSD.org>
Wed, 17 Jun 2020 17:50:06 +0000 (12:50 -0500)
1  2 
config/config.exs patch | diff1 | diff2 | blob | history
config/description.exs patch | diff1 | diff2 | blob | history

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