Maxim Filippov ec969eec51 Merge branch 'develop' into 'fix/admin-api-user-deletion' ... # Conflicts: # CHANGELOG.md		2019-08-14 22:45:32 +00:00
..
mix	Do not check if actor is active when deleting a user	2019-08-15 01:35:29 +03:00
pleroma	Merge branch 'develop' into 'fix/admin-api-user-deletion'	2019-08-14 22:45:32 +00:00
healthcheck.ex
jason_types.ex
transports.ex
xml_builder.ex