Merge branch 'dev' into 'prod' (8430a4fc) · 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

Admin message

ca. kl. 06.30 tar vi en rask omstart av git.app.uib.no for å fylle på med en oppdatering. Forventet nedetid er ca. 3 minutter
---
At approx. 06.30 CET there will be a quick restart of git.app.uib.no for an upgrade. Expected downtime is about 3 minutes.

8430a4fc

Commit 8430a4fc authored 3 years ago by Henrik Askjer

Downloads
- Plain Diff

Merge branch 'dev' into 'prod'

Dev

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

parents 9ed51935 e71373ed

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

package.json 1 addition, 1 deletion

package.json
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 38 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 88 additions and 63 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