Merge branch 'patch-1' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Mon, 11 Nov 2019 14:09:46 +0000 (14:09 +0000)
committerrinpatch <rinpatch@sdf.org>
Mon, 11 Nov 2019 14:09:46 +0000 (14:09 +0000)
commit51f40fab0055a75b4a0f4514f78f7004d755c1e5
treeacfde60f7c5f7d676734e478efc6f3ac1bbdd5ff
parent54ae688fa10161d0831001bb041c01a2de86ab58
parent72cc92259ea2f9d299943b845f7a339255cf99fe
Merge branch 'patch-1' into 'develop'

Default config: Use extended nickname format

See merge request pleroma/pleroma!1968