aboutsummaryrefslogtreecommitdiff
path: root/src/components/user_settings/user_settings.js
diff options
context:
space:
mode:
authorShpuld Shpludson <shp@cock.li>2019-02-19 16:38:05 +0000
committerShpuld Shpludson <shp@cock.li>2019-02-19 16:38:05 +0000
commit0e1295edea1426af992c25d5396612c2c0b67404 (patch)
tree32d13672295f8a358cc70098bca97a6cd241393f /src/components/user_settings/user_settings.js
parent32df77c16a004bbf0ffb1b8ce64f4454d720dec6 (diff)
parentd831b8191284def1d26fad7811f674a0595cded1 (diff)
Merge branch 'follow-requests-for-locked-accounts' into 'develop'
Follow Request notification count for restricted accounts See merge request pleroma/pleroma-fe!561
Diffstat (limited to 'src/components/user_settings/user_settings.js')
0 files changed, 0 insertions, 0 deletions