diff options
| author | kaniini <nenolod@gmail.com> | 2018-09-03 14:55:42 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-09-03 14:55:42 +0000 |
| commit | 76c67a41c12a80138e984fa782d7396da53b8d32 (patch) | |
| tree | 5df0e23a10b29ee0dd31887919b8858253800296 /lib/xml_builder.ex | |
| parent | d3f6814febb95f03af58543f4896599810f9b069 (diff) | |
| parent | 1c9e539b47ff594d75c9548a04e64cb0c61cff8c (diff) | |
| download | pleroma-76c67a41c12a80138e984fa782d7396da53b8d32.tar.gz | |
Merge branch 'develop' into 'feature/staff-discovery-api'
# Conflicts:
# lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
Diffstat (limited to 'lib/xml_builder.ex')
0 files changed, 0 insertions, 0 deletions