projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4dabf64 eb0fb73)
Merge branch 'feature/bbs' into 'develop'
authorlambda <lain@soykaf.club>
Mon, 6 May 2019 17:17:03 +0000 (17:17 +0000)
committerlambda <lain@soykaf.club>
Mon, 6 May 2019 17:17:03 +0000 (17:17 +0000)
BBS / SSH

See merge request pleroma/pleroma!997

1  2 
config/config.exs patch | diff1 | diff2 | blob | history
docs/config.md patch | diff1 | diff2 | blob | history

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