diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-11-17 12:40:42 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-11-17 12:40:42 +0000 |
| commit | 6c3273892f195e4ac4cf56836e4ef0d11a149434 (patch) | |
| tree | acfbf1a45d34bdff208f40a5b7b62c1d71443cf1 /lib | |
| parent | 651fade275e341f778396d9aa86fa2032d2d0a31 (diff) | |
| parent | 11d8fefa7b88be44ed23bdc9d3f62ce83169db8d (diff) | |
| download | pleroma-6c3273892f195e4ac4cf56836e4ef0d11a149434.tar.gz | |
Merge branch 'sync-stable/2.2.0' into 'develop'
Import stable commits into develop after releasing 2.2.0
Closes #2275, #1516, #2257, #2242, #1668, and #2236
See merge request pleroma/pleroma!3151
Diffstat (limited to 'lib')
0 files changed, 0 insertions, 0 deletions