diff options
| author | Shpuld Shpludson <shp@cock.li> | 2020-08-27 13:59:56 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2020-08-27 13:59:56 +0000 |
| commit | c7ddfefe34a254fd1e939fb652696f04891d5060 (patch) | |
| tree | bd848862d64cd87f96588e16eca14b81c06a9b33 /src/components/settings_modal/settings_modal.vue | |
| parent | c0205d582a565e8848c413db3e4531b454f13690 (diff) | |
| parent | 5d49edc823ba2ea3e34d4fd6c5efcc84ef9712f7 (diff) | |
Merge branch 'master' into '2.1.0-rc0'
# Conflicts:
# CHANGELOG.md
# src/services/api/api.service.js
Diffstat (limited to 'src/components/settings_modal/settings_modal.vue')
0 files changed, 0 insertions, 0 deletions