diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-05-03 14:56:45 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-05-03 14:56:45 +0000 |
| commit | 513613a4b2aa10c982a8d62d5dd4e43137f00dcd (patch) | |
| tree | 08fa9314e6866dacef4cd7af3f55a31e07e2c918 /src/App.vue | |
| parent | b47820905c4a5b44ae0c297e3d9c5484ca202272 (diff) | |
| parent | 09253420a20001c3eb95c1c100879ccaf1f72cd4 (diff) | |
Merge branch 'patch-2' into 'develop'
Update es.json
See merge request pleroma/pleroma-fe!779
Diffstat (limited to 'src/App.vue')
0 files changed, 0 insertions, 0 deletions