diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-02-22 09:31:43 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-02-22 09:31:43 +0300 |
| commit | 8f0ca19b9cafeedc70df2d60bd7bd7c6bf7aa160 (patch) | |
| tree | f14a1ef01c90124b33b2866117ed2995e32ab369 /rel | |
| parent | 0d14c3f41053f97d23fa9295745a817c08010969 (diff) | |
| parent | 114e7b764ed5ae03211cca40e7b19f33292b3d1c (diff) | |
| download | pleroma-8f0ca19b9cafeedc70df2d60bd7bd7c6bf7aa160.tar.gz | |
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
# Conflicts:
# CHANGELOG.md
# config/config.exs
Diffstat (limited to 'rel')
0 files changed, 0 insertions, 0 deletions