projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5f625c9 e999c67)
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
authorsadposter <hannah+pleroma@coffee-and-dreams.uk>
Sun, 29 Mar 2020 19:57:38 +0000 (20:57 +0100)
committersadposter <hannah+pleroma@coffee-and-dreams.uk>
Sun, 29 Mar 2020 19:57:38 +0000 (20:57 +0100)
1  2 
config/config.exs patch | diff1 | diff2 | blob | history
lib/pleroma/web/nodeinfo/nodeinfo_controller.ex patch | diff1 | diff2 | blob | history

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