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
..
gopher	Runtime configuration	2018-11-06 19:41:15 +01:00
http	http: fix mediaproxy	2018-10-26 06:38:08 +00:00
plugs	Merge branch 'develop' into feature/compat/push-subscriptions	2018-12-06 19:55:58 +07:00
uploaders	fallbacking into local uploader	2018-11-17 20:16:25 +09:00
web	Merge branch 'develop' into feature/compat/push-subscriptions	2018-12-06 19:55:58 +07:00
activity.ex	activity: add helper to fetch an activity's parent	2018-10-25 02:47:55 +00:00
application.ex	Merge branch 'develop' into feature/compat/push-subscriptions	2018-12-06 19:55:58 +07:00
config.ex	Runtime configuration	2018-11-06 19:41:15 +01:00
emoji.ex	Fix wrong return when finmoji is disabled	2018-11-05 21:17:47 +01:00
filter.ex	Ensure filters have a filter_id	2018-11-01 09:17:02 +00:00
formatter.ex	Runtime configuration	2018-11-06 19:41:15 +01:00
html.ex	Runtime configuration	2018-11-06 19:41:15 +01:00
list.ex	Add a test for List.get_lists_account_belongs	2018-10-19 21:24:15 +09:00
notification.ex	Merge branch 'develop' into feature/compat/push-subscriptions	2018-12-06 19:55:58 +07:00
object.ex	Various runtime configuration fixes	2018-11-19 10:09:24 +01:00
PasswordResetToken.ex	Format the code.	2018-03-30 15:01:53 +02:00
repo.ex	Phoenix skeleton	2017-03-17 17:09:58 +01:00
stats.ex	Clean up unused aliases and imports	2018-05-04 21:25:31 +00:00
upload.ex	Fix lint error	2018-11-27 19:07:58 +03:00
user.ex	Add better test for user search functionlity.	2018-11-16 18:31:32 +01:00
user_invite_token.ex	Token-generating task	2018-06-17 14:30:07 +03:00