summaryrefslogtreecommitdiff
path: root/docs/development
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2024-11-12 09:58:28 +0000
committerlain <lain@soykaf.club>2024-11-12 09:58:28 +0000
commit6941c47ac8a9e9d159e20ee10eebea629481e4f3 (patch)
tree013d666b6c5a05375ac23d2331cfd08fc1d119d4 /docs/development
parent35bd1977335a2bf73207f22aecbaead6e3112a1c (diff)
parentee3ab8b625ccb26aa633276c1676a077e3b155d4 (diff)
downloadpleroma-6941c47ac8a9e9d159e20ee10eebea629481e4f3.tar.gz
pleroma-6941c47ac8a9e9d159e20ee10eebea629481e4f3.zip
Merge branch 'develop' into 'tusooa/se-opt-out'
# Conflicts: # lib/pleroma/web/metadata/providers/feed.ex
Diffstat (limited to 'docs/development')
0 files changed, 0 insertions, 0 deletions