Egor Kislitsyn 8b4397c704 Merge branch 'develop' into feature/compat/push-subscriptions ... # Conflicts: # lib/mix/tasks/sample_config.eex # lib/pleroma/web/twitter_api/controllers/util_controller.ex # mix.exs # mix.lock		2018-12-06 19:55:58 +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	Document the mix tasks in ex_doc instead	2018-11-10 13:09: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	Cleanup postgresql setup script	2018-10-27 14:31:51 +02:00
set_admin.ex	lib/mix/tasks/make_admin.ex: New task	2018-11-17 20:25:53 +01:00
set_locked.ex	Document mix tasks	2018-11-10 13:09:37 +01:00
unsubscribe_user.ex	lib/mix/tasks: s/@doc/@moduledoc/	2018-11-10 13:09:39 +01:00