diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-04-01 19:49:16 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-04-01 19:49:16 +0000 |
| commit | a595febcb86cfeda927128b8a36756db6457e58d (patch) | |
| tree | 0d88e4f12887200e6798eb5685d894ad251c1714 /src/components/user_panel/user_panel.vue | |
| parent | ae3b92ce85c15ea170b062286bea9f0201ed1014 (diff) | |
| parent | e1e0b8b2545610ea4d675ed8c20bcdc4d0376c7f (diff) | |
Merge branch 'develop' into 'develop'
[i18n] Update oc.json for !611 and !691
See merge request pleroma/pleroma-fe!712
Diffstat (limited to 'src/components/user_panel/user_panel.vue')
0 files changed, 0 insertions, 0 deletions