You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

minibikini 6163fbf553 Merge branch 'develop' into 'frontend-admin-api' ... # Conflicts: # lib/pleroma/web/router.ex		4 years ago
..
mix	Add an API endpoint to install a new frontend	4 years ago
phoenix/transports/web_socket	Merge branch 'develop' into chore/elixir-1.11	4 years ago
pleroma	Merge branch 'develop' into 'frontend-admin-api'	4 years ago
jason_types.ex	Update Copyrights	5 years ago