Egor Kislitsyn 4944498133 Merge branch 'develop' into feature/compat/push-subscriptions ... # Conflicts: # lib/pleroma/application.ex # lib/pleroma/plugs/oauth_plug.ex		2018-12-06 20:15:16 +07:00
..
deactivate_user.ex	Document the mix tasks in ex_doc instead	2018-11-10 13:09:37 +01:00
generate_config.ex	Merge branch 'develop' into feature/compat/push-subscriptions	2018-12-06 19:55:58 +07:00
generate_invite_token.ex	Document the mix tasks in ex_doc instead	2018-11-10 13:09:37 +01:00
generate_password_reset.ex	lib/mix/tasks: s/@doc/@moduledoc/	2018-11-10 13:09:39 +01:00
make_moderator.ex	Sorry	2018-12-05 16:44:15 +01:00
migrate_local_uploads.ex	Uploads fun, part. 2	2018-11-30 18:02:37 +01:00
reactivate_user.ex	lib/mix/tasks: s/@doc/@moduledoc/	2018-11-10 13:09:39 +01:00
register_user.ex	Document mix tasks	2018-11-10 13:09:37 +01:00
relay_follow.ex	lib/mix/tasks/relay*: Use a with block	2018-11-17 22:12:13 +01:00
relay_unfollow.ex	lib/mix/tasks/relay*: Use a with block	2018-11-17 22:12:13 +01:00
rm_user.ex	Document the mix tasks in ex_doc instead	2018-11-10 13:09:37 +01:00
sample_config.eex	Merge branch 'develop' into feature/compat/push-subscriptions	2018-12-06 19:55:58 +07:00
sample_psql.eex	Add uuid generation extension to sample_psql.eex.	2018-12-02 11:20:49 +01:00
set_admin.ex	Sorry	2018-12-05 16:44:15 +01:00
set_locked.ex	Sorry	2018-12-05 16:44:15 +01:00
unsubscribe_user.ex	lib/mix/tasks: s/@doc/@moduledoc/	2018-11-10 13:09:39 +01:00