diff options
| author | Shpuld Shpludson <shp@cock.li> | 2020-03-07 15:03:13 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2020-03-07 15:03:13 +0000 |
| commit | 38455294120a27d254b6cbe237a1adcf9d27e6af (patch) | |
| tree | ec29a29d40b0b446192d297bcfa1f406d5db8bce /src/components/user_settings/confirm.vue | |
| parent | 83d8343777050f6ee5fad09832b3878885eda4dd (diff) | |
| parent | 2c3db2b6a2c755c4ca569f3031d6e3cbe507b116 (diff) | |
Merge branch 'develop' into 'master'
update master with develop changes
See merge request pleroma/pleroma-fe!1082
Diffstat (limited to 'src/components/user_settings/confirm.vue')
0 files changed, 0 insertions, 0 deletions