kaniini 0f5bff8c66 Merge branch 'develop' into 'feature/relay' ... # Conflicts: # lib/pleroma/web/activity_pub/utils.ex		2018-08-26 21:06:15 +00:00
..
deactivate_user.ex
fix_ap_users.ex
generate_config.ex
generate_invite_token.ex	Update generate_invite_token.ex	2018-08-12 11:11:08 +00:00
generate_password_reset.ex
make_moderator.ex	set_moderator: ensureall applications are started.	2018-06-12 15:42:40 +03:00
register_user.ex
relay_follow.ex	relay: fix invoking federator, use a timer to sleep the mix task to force a context switch	2018-08-06 08:22:12 +00:00
relay_unfollow.ex	relay: fix invoking federator, use a timer to sleep the mix task to force a context switch	2018-08-06 08:22:12 +00:00
rm_user.ex
sample_config.eex	Update sample_config.eex	2018-06-12 07:23:45 +00:00
sample_psql.eex
set_locked.ex