Skip to content
Snippets Groups Projects
Commit a3bea000 authored by Edward Alexander Jaya's avatar Edward Alexander Jaya
Browse files

Merge branch 'dev' into 'feature/edit'

# Conflicts:
#   frontend/components/view/Suggest.vue
#   frontend/config.js
#   frontend/nuxt.config.js
#   frontend/pages/main/edit.vue
parents fc277659 4e7ac897
Pipeline #23933 passed with stage
in 51 seconds