diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-07-31 17:46:40 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-07-31 17:46:40 +0000 |
| commit | 0e6489d84019ac146af1dd5df9f1db548b4df5ac (patch) | |
| tree | 0581e1be094d090930a4ef1456f6d665f83d7c70 /src/modules/instance.js | |
| parent | f031e96334d9c5eeb510dcb1dc8700edd4ec2465 (diff) | |
| parent | 6380f7df169f425526400d2eaddad0c3341a7cfe (diff) | |
Merge branch 'patch-2' into 'develop'
Update es.json (add sticker)
See merge request pleroma/pleroma-fe!893
Diffstat (limited to 'src/modules/instance.js')
0 files changed, 0 insertions, 0 deletions