summaryrefslogtreecommitdiff
path: root/lib/pleroma/web/mastodon_api/websocket_handler.ex
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2020-09-08 17:21:12 +0000
committerrinpatch <rinpatch@sdf.org>2020-09-08 17:21:12 +0000
commit425324aae3d4534bc045466a1cc15653ddfa27d2 (patch)
tree2d785eb4396e2dc79bb6b0bed5d766b393479dd5 /lib/pleroma/web/mastodon_api/websocket_handler.ex
parent73dd5bdb7dcdf804bdbabcf632671d4de5042ebc (diff)
parent073f5490ece616fd9602382c1be1347457cbbe79 (diff)
Merge branch 'release/2.1.1' into 'stable'v2.1.1
2.1.1 release See merge request pleroma/secteam/pleroma!13
Diffstat (limited to 'lib/pleroma/web/mastodon_api/websocket_handler.ex')
0 files changed, 0 insertions, 0 deletions