Skip to content
Commit cc15db01 authored by Paul Khlopkov's avatar Paul Khlopkov 🏀
Browse files

Merge branch 'master' into 'dev'

# Conflicts:
#   frontend/components/cabinet/AuthFooter.vue
#   frontend/nuxt.config.js
#   frontend/package.json
#   frontend/plugins/custom-plugins.js
parents 4887dbdb 4bc18a94
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment