pleroma/priv
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
..
gettext Phoenix skeleton 2017-03-17 17:09:58 +01:00
repo Mastodon API: Support push subscription CRUD 2018-09-22 07:04:01 +02:00
static update pleroma frontend 2018-11-18 17:27:48 +00:00