summaryrefslogtreecommitdiff
path: root/docs/development
diff options
context:
space:
mode:
authorfeld <feld@feld.me>2023-11-17 16:50:36 +0000
committerfeld <feld@feld.me>2023-11-17 16:50:36 +0000
commit906b121a1053557016734be0bf224c5ad317ee08 (patch)
tree5e6b8a27b153f870478f224899df00f6335d5e74 /docs/development
parentbe39146ecc6d55191f8ed3ec9cd3e113d8ee5e21 (diff)
parentca1b18ba2df38970582f64e0fed9147a5bfff43e (diff)
downloadpleroma-906b121a1053557016734be0bf224c5ad317ee08.tar.gz
pleroma-906b121a1053557016734be0bf224c5ad317ee08.zip
Merge branch 'develop' into 'vips'
# Conflicts: # mix.exs
Diffstat (limited to 'docs/development')
0 files changed, 0 insertions, 0 deletions