179af131ee
# Conflicts: # CHANGELOG.md |
||
---|---|---|
.. | ||
helpers | ||
tabs | ||
settings_modal_content.js | ||
settings_modal_content.scss | ||
settings_modal_content.vue | ||
settings_modal.js | ||
settings_modal.scss | ||
settings_modal.vue |
179af131ee
# Conflicts: # CHANGELOG.md |
||
---|---|---|
.. | ||
helpers | ||
tabs | ||
settings_modal_content.js | ||
settings_modal_content.scss | ||
settings_modal_content.vue | ||
settings_modal.js | ||
settings_modal.scss | ||
settings_modal.vue |