aboutsummaryrefslogtreecommitdiff
path: root/src/components/user_settings/user_settings.js
diff options
context:
space:
mode:
authorShpuld Shpludson <shp@cock.li>2019-01-27 20:49:09 +0000
committerShpuld Shpludson <shp@cock.li>2019-01-27 20:49:09 +0000
commit8258c8b3f0ea22581a6072ac6e311d5254fb28b9 (patch)
tree16ea14befcd5058de8dc3acda1120c8980cb2d9d /src/components/user_settings/user_settings.js
parent6e945ee14bc4e603df3a70d51f6aeadfeeac737e (diff)
parente4303da372687130903ee7b6c18b61a2b82601c0 (diff)
Merge branch 'fix-chat' into 'develop'
Properly handle websocket token (fixes chat). See merge request pleroma/pleroma-fe!483
Diffstat (limited to 'src/components/user_settings/user_settings.js')
0 files changed, 0 insertions, 0 deletions