projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 64165d1 8eebc75)
Merge remote-tracking branch 'pleroma/develop' into featureflag/emoji_reactions
authorHaelwenn (lanodan) Monnier <contact@hacktivis.me>
Tue, 24 Mar 2020 19:32:49 +0000 (20:32 +0100)
committerHaelwenn (lanodan) Monnier <contact@hacktivis.me>
Tue, 24 Mar 2020 19:32:49 +0000 (20:32 +0100)
1  2 
lib/pleroma/web/nodeinfo/nodeinfo_controller.ex patch | diff1 | diff2 | blob | history
test/web/node_info_test.exs patch | diff1 | diff2 | blob | history

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