diff options
| author | Shpuld Shpludson <shp@cock.li> | 2020-03-04 15:42:37 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2020-03-04 15:42:37 +0000 |
| commit | 83d8343777050f6ee5fad09832b3878885eda4dd (patch) | |
| tree | a19ad2a67136fc21d7794848e811f092eb0e0706 /src/components/password_reset/password_reset.vue | |
| parent | 1b9805b550444403792db2304b5a6d5681e8f30d (diff) | |
| parent | 147364b80cae7a0fac1ccf00b5669a20de1b7e67 (diff) | |
Merge branch 'develop' into 'master'
Update master with 2.0.0
See merge request pleroma/pleroma-fe!1080
Diffstat (limited to 'src/components/password_reset/password_reset.vue')
0 files changed, 0 insertions, 0 deletions