diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-05-07 17:35:28 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-05-07 17:35:28 +0000 |
| commit | 496ccd0bb3b48c6f9f03bd6c7cf0355f98b7871d (patch) | |
| tree | 544ed8377eb8ccaf0e0d43142f5da71d1b784587 /src/components/user_settings/user_settings.js | |
| parent | 58ef6258d6d9d241445a47563e702f91330c6b2e (diff) | |
| parent | bfd25a5c3f409dee076a2fb25c92c208ad29a296 (diff) | |
Merge branch 'patch-2' into 'develop'
Update es.json
See merge request pleroma/pleroma-fe!784
Diffstat (limited to 'src/components/user_settings/user_settings.js')
0 files changed, 0 insertions, 0 deletions