Merge branch 'dev' into 'prod' (ed247c9f) · Commits · Margunn.Rauset / beta.ordbok.uib.no · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

beta.ordbok.uib.no
- Activity
- Members
- Terraform modules

Snippets Groups Projects

ed247c9f

Commit ed247c9f authored 3 years ago by Henrik Askjer

Downloads
- Plain Diff

Merge branch 'dev' into 'prod'

Dev

See merge request spraksamlingane/beta.ordbok.uib.no!97

parents ce831d1f ef8ec3f4

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

package-lock.json 6 additions, 114 deletions

package-lock.json
package.json 0 additions, 5 deletions

package.json
src/components/Article.vue 13 additions, 1 deletion

src/components/Article.vue
src/components/ArticleFooter.vue 95 additions, 48 deletions

src/components/ArticleFooter.vue
src/components/Autocomplete.vue 1 addition, 1 deletion

src/components/Autocomplete.vue
src/components/DictionaryView.vue 1 addition, 1 deletion

src/components/DictionaryView.vue
src/components/Header.vue 39 additions, 71 deletions

src/components/Header.vue
src/main.js 0 additions, 3 deletions

src/main.js
src/plugins/vuetify.js 1 addition, 33 deletions

src/plugins/vuetify.js

with 156 additions and 277 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment