diff options
| author | feld <feld@feld.me> | 2022-09-18 02:31:26 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2022-09-18 02:31:26 +0000 |
| commit | 7ac4e858a019891ce5873936db1b4a0ec0566a97 (patch) | |
| tree | 3d4bae55d6eb3124fa8f0c7475b2646e4012a890 /docs/installation/netbsd_en.md | |
| parent | 1fff9a25208b3cdedf4f8172378e019a01eca320 (diff) | |
| parent | 1a7107f4a5595e8723c594ca8cc58e70bcca529f (diff) | |
| download | pleroma-7ac4e858a019891ce5873936db1b4a0ec0566a97.tar.gz | |
Merge branch 'develop' into 'finch_everywhere'
# Conflicts:
# lib/pleroma/web/media_proxy/media_proxy_controller.ex
Diffstat (limited to 'docs/installation/netbsd_en.md')
0 files changed, 0 insertions, 0 deletions