diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-05-03 14:57:04 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-05-03 14:57:04 +0000 |
| commit | 0438031da44a70816716de40625541d569a49c85 (patch) | |
| tree | b47bf7889bb6b33ce4b72874343d3b2cc907f2a4 /src/main.js | |
| parent | 513613a4b2aa10c982a8d62d5dd4e43137f00dcd (diff) | |
| parent | b98bab52a9912a3cb09e87cd6bf8d2d0fc0daf01 (diff) | |
Merge branch 'develop' into 'develop'
[i18n]Update oc.json
See merge request pleroma/pleroma-fe!777
Diffstat (limited to 'src/main.js')
0 files changed, 0 insertions, 0 deletions