projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ab6e156 d378b34)
Merge branch 'mongooseim-support' into 'develop'
authorkaniini <nenolod@gmail.com>
Wed, 22 May 2019 04:06:54 +0000 (04:06 +0000)
committerkaniini <nenolod@gmail.com>
Wed, 22 May 2019 04:06:54 +0000 (04:06 +0000)
MongooseIM: Add basic integration endpoints.

See merge request pleroma/pleroma!1172

1  2 
CHANGELOG.md patch | diff1 | diff2 | blob | history
config/config.exs patch | diff1 | diff2 | blob | history
lib/pleroma/web/router.ex patch | diff1 | diff2 | blob | history

diff --cc CHANGELOG.md
Simple merge
diff --cc config/config.exs
Simple merge
diff --cc lib/pleroma/web/router.ex
Simple merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git