Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into websearch
authorlain <lain@soykaf.club>
Thu, 19 Nov 2020 16:32:57 +0000 (17:32 +0100)
committerlain <lain@soykaf.club>
Thu, 19 Nov 2020 16:32:57 +0000 (17:32 +0100)
commit5e04f4156ce64e5be633fce19c56bec0d93f53bf
tree2705d30f1cc374b9cb1ae57be961a2f701655c5f
parentb38c3de411a863e51f4e00cb34f4ce59c8d333ea
parentc8d11c306452ea36f5690ba1824434dc71bd9f95
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into websearch
CHANGELOG.md
config/config.exs
docs/configuration/cheatsheet.md
lib/pleroma/activity/search.ex