diff options
| author | Shpuld Shpludson <shp@cock.li> | 2018-04-15 05:12:07 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2018-04-15 05:12:07 +0000 |
| commit | 6ef2385d1406e625d5fc03e5b60d9e6ead4fb2ba (patch) | |
| tree | 836a323142dd5a83e885a1032293b9063ad61df0 /src/components/nav_panel/nav_panel.vue | |
| parent | 208b2ed12528053efa351f1720cd316dbdac8aa9 (diff) | |
| parent | 986dbab3d267541449cd9ba684c632d9fe67ced7 (diff) | |
Merge branch 'patch-3' into 'develop'
Update messages.js: Added "streaming" french translation and corrected typo.
See merge request pleroma/pleroma-fe!221
Diffstat (limited to 'src/components/nav_panel/nav_panel.vue')
0 files changed, 0 insertions, 0 deletions
