honkoma/priv
kaniini 76c67a41c1 Merge branch 'develop' into 'feature/staff-discovery-api'
# Conflicts:
#   lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
2018-09-03 14:55:42 +00:00
..
gettext Phoenix skeleton 2017-03-17 17:09:58 +01:00
repo Merge branch 'develop' into 'feature/staff-discovery-api' 2018-09-03 14:55:42 +00:00
static update pleroma frontend 2018-08-31 04:35:18 +00:00