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