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)
commit212c31c63796a21233e8decf7ce46853383286fd
tree0cc01fbf91ddb5037d67b39f0af80737aeec51ad
parent64165d1df95bc3a22260dafa4584471427685864
parent8eebc75c152ee339bac347350266e3bc6536016b
Merge remote-tracking branch 'pleroma/develop' into featureflag/emoji_reactions
lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
test/web/node_info_test.exs