diff options
| author | lain <lain@soykaf.club> | 2020-08-28 14:40:26 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-08-28 14:40:26 +0000 |
| commit | 51844b1e420fdfbceed6fda85e4c2e0ad87a9b1e (patch) | |
| tree | 21fbe0f8b6057a2641b474b3e62e94a7c42002a5 /lib/xml_builder.ex | |
| parent | b41c8cff18f7c7e6a7170a479452b5dc3d659efa (diff) | |
| parent | ce387ce7306d944c11e63f0c86719afd5c2da2d2 (diff) | |
| download | pleroma-51844b1e420fdfbceed6fda85e4c2e0ad87a9b1e.tar.gz | |
Merge branch 'stable-sync/2.1.0' into 'develop'
Merge stable in develop and bump development version
Closes #1610, #1621, #1613, #1375, #1374, #1614, #1422, #1595, #1620, #1364, #1640, #1643, #1653, #1624, #764, #1687, #1698, #1670, #1677, #1727, #1559, #1746, #1313, #1810, #751, and #866
See merge request pleroma/pleroma!2928
Diffstat (limited to 'lib/xml_builder.ex')
0 files changed, 0 insertions, 0 deletions