diff options
| author | Shpuld Shpludson <shp@cock.li> | 2020-12-01 10:47:10 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2020-12-01 10:47:10 +0000 |
| commit | 655d985a82d194cd38c5ec75f1b0153804965d5f (patch) | |
| tree | 72b48d63177d9731edec0a3d5793683012ffd6fe /src/components/password_reset/password_reset.vue | |
| parent | 276ef31145c4f485c0b899f5243c49e2cbf80cc1 (diff) | |
| parent | 133294dc2aa56927097e7641dec7f15ad9179d80 (diff) | |
Merge branch 'develop' into 'fix/use-semantically-correct-buttons'
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'src/components/password_reset/password_reset.vue')
0 files changed, 0 insertions, 0 deletions