diff options
| author | Shpuld Shpludson <shp@cock.li> | 2020-06-27 07:19:49 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2020-06-27 07:19:49 +0000 |
| commit | ea0a12f6049241cb9e8fa7cd5bc6dc8b9852b57c (patch) | |
| tree | 36863abf8ac320756bc16906b11a7892ea7da0dc /src/_variables.scss | |
| parent | bad3dacfac1ef3dd2c0f55b53fb78f4bf410a01e (diff) | |
| parent | bbb91d8ae3f1c3d5374de7610e723e63121e8222 (diff) | |
Merge branch 'develop' into 'iss-149/profile-fields-setting'
# Conflicts:
# src/components/settings_modal/tabs/profile_tab.vue
Diffstat (limited to 'src/_variables.scss')
0 files changed, 0 insertions, 0 deletions