diff options
| author | feld <feld@feld.me> | 2021-02-08 16:43:04 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2021-02-08 16:43:04 +0000 |
| commit | 85cb122986087062a192c31bc517f2698239819c (patch) | |
| tree | 9f94d0bbf7bf8f68c272b43a779e49a4892e55b6 /test/instance_static/emoji/test_pack | |
| parent | 4dbb08a19f57e720e299608ebeb4387d37c55e99 (diff) | |
| parent | 8babd796da46975c2d976cf87dad844c13e8a69e (diff) | |
| download | pleroma-85cb122986087062a192c31bc517f2698239819c.tar.gz pleroma-85cb122986087062a192c31bc517f2698239819c.zip | |
Merge branch 'develop' into 'docs/improve-mailer-settings-desc'
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'test/instance_static/emoji/test_pack')
0 files changed, 0 insertions, 0 deletions