Merge branch 'dev' of git.app.uib.no:spraksamlingane/beta.ordbok.uib.no into dev (40e10d01) · 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

40e10d01

Commit 40e10d01 authored 3 years ago by Henrik Askjer

Downloads
- Plain Diff

Merge branch 'dev' of git.app.uib.no:spraksamlingane/beta.ordbok.uib.no into dev

parents 5e746356 99debf72

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

src/components/Article.vue 2 additions, 2 deletions

src/components/Article.vue
src/components/ArticleFooter.vue 2 additions, 2 deletions

src/components/ArticleFooter.vue
src/components/Autocomplete.vue 4 additions, 1 deletion

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

src/components/Definition.vue
src/components/DictionaryView.vue 37 additions, 35 deletions

src/components/DictionaryView.vue
src/components/Header.vue 7 additions, 7 deletions

src/components/Header.vue
src/components/SearchResults.vue 9 additions, 9 deletions

src/components/SearchResults.vue
src/main.js 20 additions, 1 deletion

src/main.js
src/utils/entities.js 2 additions, 2 deletions

src/utils/entities.js
src/utils/helpers.js 2 additions, 2 deletions

src/utils/helpers.js

with 86 additions and 62 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