Merge remote-tracking branch 'pleroma/develop' into staff-plug
authorAlex Gleason <alex@alexgleason.me>
Wed, 4 Aug 2021 16:48:57 +0000 (11:48 -0500)
committerAlex Gleason <alex@alexgleason.me>
Wed, 4 Aug 2021 16:48:57 +0000 (11:48 -0500)
commit44ede0657f2da0a761de76b1f9822a293430d497
tree387a8915bdb6ff1295f4f0872b2e6bc97e177831
parent1f093cb216ed0d6b0d23b05e1ffbbf55dc72bbee
parentd8a986c9e893de8eed3aa336a557695669b1ffee
Merge remote-tracking branch 'pleroma/develop' into staff-plug
lib/pleroma/web/router.ex