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
..
mix/tasks	Merge branch 'develop' into feature/compat/push-subscriptions	2018-12-06 19:55:58 +07:00
pleroma	Merge branch 'develop' into feature/compat/push-subscriptions	2018-12-06 19:55:58 +07:00
jason_types.ex
transports.ex
xml_builder.ex