diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-05-15 05:02:47 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-05-15 05:02:47 +0000 |
| commit | 671ecfb1521ab3ff4f853671866ac189a64aadf5 (patch) | |
| tree | 7a16a0d9ee3b786d19e4b90000fbb80b809e8487 /src/modules/users.js | |
| parent | 2eea36f6233fd57bed3c3d35d763b27f0812f1db (diff) | |
| parent | ca52a7321d010b8edeeca4c0687584a4d3df6e63 (diff) | |
Merge branch 'resolve-weblate-merge-conflicts' into 'develop'
Resolve weblate merge conflicts
See merge request pleroma/pleroma-fe!1114
Diffstat (limited to 'src/modules/users.js')
0 files changed, 0 insertions, 0 deletions