diff options
| author | Tarteka <info@tarteka.net> | 2019-10-30 22:16:12 +0100 |
|---|---|---|
| committer | Tarteka <info@tarteka.net> | 2019-10-30 22:16:12 +0100 |
| commit | a178346f1e0fbe2246532bbfeba5fd1cc0c1cb2d (patch) | |
| tree | dcfe0725b11e1615d28a636e84642a0e3436855c /src/components/user_settings/user_settings.js | |
| parent | 8b2d873057a220673d8212cf4542103b54ffbe5c (diff) | |
| parent | 7c26435e66fd7e142ea4b88fbe51eede32eeb5ce (diff) | |
Merge branch 'master' of https://git.pleroma.social/pleroma/pleroma-fe into develop
Diffstat (limited to 'src/components/user_settings/user_settings.js')
0 files changed, 0 insertions, 0 deletions