1
0
mirror of https://git.pleroma.social/sjw/pleroma.git synced 2024-12-26 17:55:06 +01:00
pleroma/priv
lain d7f9679ff2 Merge branch 'develop' into 'reactions'
# Conflicts:
#   CHANGELOG.md
2019-10-10 12:38:51 +00:00
..
gettext
repo Enable mix format for migrations 2019-10-08 15:16:39 +03:00
static Merge branch 'develop' into 'reactions' 2019-10-10 12:38:51 +00:00
templates