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
..
migrations	Merge branch 'develop' into feature/compat/push-subscriptions	2018-12-06 20:15:16 +07:00
seeds.exs	Phoenix skeleton	2017-03-17 17:09:58 +01:00