diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-02-22 14:54:12 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-02-22 14:54:12 +0000 |
| commit | e34e1ccdae06302ee734414267a357ff5b7c888c (patch) | |
| tree | f1882a022a155a10ad10a3bb92d75f6a4a1f7f5a /src/components/timeline/timeline.js | |
| parent | 3768a4623fc227614b0b3920c2cb92ca16404a69 (diff) | |
| parent | 22851a3a967cc5364a95c71bda48eccc3808bf41 (diff) | |
Merge branch '227-manage-blocks-mutes' into 'develop'
Add Blocks / Mutes management tabs under user settings page
See merge request pleroma/pleroma-fe!578
Diffstat (limited to 'src/components/timeline/timeline.js')
0 files changed, 0 insertions, 0 deletions