akkoma/priv
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
..
gettext Phoenix skeleton 2017-03-17 17:09:58 +01:00
repo Merge branch 'develop' into feature/compat/push-subscriptions 2018-12-06 20:15:16 +07:00
static update-pleroma-frontend 2018-12-03 13:24:25 +09:00