diff options
| author | stwf <steven.fuchs@dockyard.com> | 2020-06-03 17:25:53 -0400 |
|---|---|---|
| committer | stwf <steven.fuchs@dockyard.com> | 2020-06-03 17:25:53 -0400 |
| commit | 906ac57ba8246322b0545c51e498559809710146 (patch) | |
| tree | b84f24d8bb64adeb972be8a6adf2388a2ce641d9 /docs/configuration | |
| parent | 5677b21e824aa7f3b5124068ef65041e04002579 (diff) | |
| parent | aa26dc6a130614b049696784ecb29e341956bbc2 (diff) | |
| download | pleroma-906ac57ba8246322b0545c51e498559809710146.tar.gz | |
Merge branch 'preload-data' of git.pleroma.social:stwf/pleroma into preload-data
# Conflicts:
# lib/pleroma/web/preload/status_net.ex
Diffstat (limited to 'docs/configuration')
0 files changed, 0 insertions, 0 deletions