diff options
| author | Shpuld Shpludson <shp@cock.li> | 2020-09-17 17:26:22 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2020-09-17 17:26:22 +0000 |
| commit | b225c3578f3c89af5ed3a0be3f8f3a6bbcedcc7d (patch) | |
| tree | bdc628fbb9706b1257bd5623284246238878bd8b /src/modules/instance.js | |
| parent | 938887ef91a12dcaaaaa0884af4e76abd1c6c679 (diff) | |
| parent | 30efbaab34b25834531c0f978cb4494eefeebfa1 (diff) | |
Merge branch 'rc/2.1.2' into 'master'
Merge 2.1.2 to MASTER
See merge request pleroma/pleroma-fe!1236
Diffstat (limited to 'src/modules/instance.js')
0 files changed, 0 insertions, 0 deletions