diff options
| author | Shpuld Shpludson <shp@cock.li> | 2020-09-08 09:46:19 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2020-09-08 09:46:19 +0000 |
| commit | 938887ef91a12dcaaaaa0884af4e76abd1c6c679 (patch) | |
| tree | 14d913a145a4e7bcb9221a38aea70410293ce69f /src/components/settings_modal/helpers/integer_setting.vue | |
| parent | e768ec1fca2f7580d111b0878a9695b0c8b9dbb1 (diff) | |
| parent | f31bc5310e544cd6f960471659c5a83e1f1721be (diff) | |
Merge branch 'rc/2.1.1' into 'master'
Update master with 2.1.1
See merge request pleroma/pleroma-fe!1231
Diffstat (limited to 'src/components/settings_modal/helpers/integer_setting.vue')
0 files changed, 0 insertions, 0 deletions