Merge branch 'develop' of gitssh.ihatebeinga.live:IHBAGang/pleroma into develop
authorsadposter <hannah+pleroma@coffee-and-dreams.uk>
Tue, 14 Dec 2021 14:01:09 +0000 (14:01 +0000)
committersadposter <hannah+pleroma@coffee-and-dreams.uk>
Tue, 14 Dec 2021 14:01:09 +0000 (14:01 +0000)
commit8f78cb3050c12b45e608b681a6bf406c76f90031
tree7a23ada136e0d116b46c51d242bb6ed6c43be6a0
parent5d901c337ed23e4b937df9e0bf8a764a58288a37
parent703f53c08f17812c20274ad80de0ec44bf4e5992
Merge branch 'develop' of gitssh.ihatebeinga.live:IHBAGang/pleroma into develop
lib/pleroma/search/elasticsearch.ex