diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-09-08 17:57:02 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-09-08 17:57:02 +0000 |
| commit | 7c055af567e08be7f171a2fb687926bef5920899 (patch) | |
| tree | 46f61ff85c2fcacb5331e18984732b5ef696b124 /lib | |
| parent | 0d2814ec8e41942cd5b056d9c1ed902be1e1773c (diff) | |
| parent | 5ef840ed9ce277ebaf6367f2529cc686b8d6404b (diff) | |
| download | pleroma-7c055af567e08be7f171a2fb687926bef5920899.tar.gz | |
Merge branch 'stable-sync/2.1.1' into 'develop'
Sync stable with develop after 2.1.1
Closes #2, #2047, #2095, #2116, #1987, and #2080
See merge request pleroma/pleroma!2974
Diffstat (limited to 'lib')
0 files changed, 0 insertions, 0 deletions