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
4 merge requests!40Release First Version,!31Output feature,!28Feature/edit,!21Add dockerize
Pipeline #23933 passed with stage
in 51 seconds
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1773 additions and 1019 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment