Skip to content
Snippets Groups Projects
Commit c900ff39 authored by lain's avatar lain
Browse files

Merge branch 'features/pleroma-tan-mastofe' into 'develop' 

mastodon_api_controller.ex: Add pleroma-tan to initial_state

See merge request pleroma/pleroma!1018
parents 3f8be270 af0065a7
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment