diff options
| author | Tusooa Zhu <tusooa@kazv.moe> | 2022-07-03 22:24:57 +0000 |
|---|---|---|
| committer | Tusooa Zhu <tusooa@kazv.moe> | 2022-07-03 22:24:57 +0000 |
| commit | 4edc867b87362475a8cd749257e5d29c431467b4 (patch) | |
| tree | 8805651d07c82f48c2935dcdf598016045a1813d /docs/configuration/static_dir.md | |
| parent | 014096aeefe88348323db74e2ab7f81e0184bfee (diff) | |
| parent | c50ade26ba9f63802512a745107de66aba59e9fe (diff) | |
| download | pleroma-4edc867b87362475a8cd749257e5d29c431467b4.tar.gz pleroma-4edc867b87362475a8cd749257e5d29c431467b4.zip | |
Merge branch 'develop' into 'from/upstream-develop/tusooa/edits'
# Conflicts:
# lib/pleroma/constants.ex
Diffstat (limited to 'docs/configuration/static_dir.md')
0 files changed, 0 insertions, 0 deletions