diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-10-21 11:05:09 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-10-21 11:05:09 +0300 |
| commit | a11a7176d59deafa08a865d6e0950b9b9c540f18 (patch) | |
| tree | 9a5004f4de7bfa4bf515adaddab65e290d8e38e7 /lib/xml_builder.ex | |
| parent | 75da202ab74489af15e086f06810e22211d52d33 (diff) | |
| parent | 2ebe8c416a72b512feaba87040982da5bcf865cf (diff) | |
| download | pleroma-a11a7176d59deafa08a865d6e0950b9b9c540f18.tar.gz | |
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
# Conflicts:
# lib/pleroma/user/info.ex
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/activity_pub/transmogrifier.ex
Diffstat (limited to 'lib/xml_builder.ex')
0 files changed, 0 insertions, 0 deletions