lain 6b32e1de23 Merge branch 'frontend-admin-api' into 'develop' ... Add an API to manage frontends Closes #2238 See merge request pleroma/pleroma!3108		2020-11-18 17:51:57 +00:00
..
mix	Merge branch 'develop' into frontend-admin-api	2020-11-17 18:34:04 +04:00
phoenix/transports/web_socket	Merge branch 'develop' into chore/elixir-1.11	2020-10-13 09:54:53 -05:00
pleroma	Merge branch 'frontend-admin-api' into 'develop'	2020-11-18 17:51:57 +00:00
jason_types.ex	Update Copyrights	2020-03-03 16:44:49 -06:00