mirror of
https://git.pleroma.social/pleroma/pleroma.git
synced 2024-12-23 08:36:29 +00:00
049ece1ef3
# Conflicts: # lib/pleroma/web/feed/user_controller.ex # lib/pleroma/web/o_status/o_status_controller.ex # lib/pleroma/web/router.ex # lib/pleroma/web/static_fe/static_fe_controller.ex |
||
---|---|---|
.. | ||
credo/check/consistency | ||
fixtures | ||
instance_static | ||
mix | ||
pleroma | ||
support | ||
test_helper.exs |