Peer Settings Pane (Display Name + Blocking) #22

Merged
erinn merged 2 commits from splash into trunk 2021-03-17 22:19:01 +00:00

2 Commits

Author SHA1 Message Date
erinn 8c7f08ee19 Merge branch 'trunk' into splash 2021-03-17 15:06:25 -07:00
Sarah Jamie Lewis 43fa810aa2 Peer Settings Pane (Display Name + Blocking) 2021-03-17 14:48:11 -07:00