diff options
| author | feld <feld@feld.me> | 2019-10-04 14:16:28 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2019-10-04 14:16:28 +0000 |
| commit | 31e57cd1b34798afb07a8de4c0c95ef3c15e22ed (patch) | |
| tree | 461d3d50b855d080eb17f0946213168a87ac7625 /lib/xml_builder.ex | |
| parent | b8b98ac40f042a8c3d2562edc095f0e1a309760f (diff) | |
| parent | 27110793a7d8e3aa6434bde63a1f687424ae779c (diff) | |
| download | pleroma-31e57cd1b34798afb07a8de4c0c95ef3c15e22ed.tar.gz | |
Merge branch 'develop' into 'fix/extended-nickname-format-default-config'
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'lib/xml_builder.ex')
0 files changed, 0 insertions, 0 deletions