Merge branch 'dev' into 'prod' (998073bd) · Commits · Språksamlingane / beta.ordbok.uib.no · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

beta.ordbok.uib.no
- Activity
- Members
- Labels
- Releases
- Model registry
- Incidents

Snippets Groups Projects

998073bd

Commit 998073bd authored 3 years ago by Henrik Askjer

Downloads
- Plain Diff

Merge branch 'dev' into 'prod'

Dev

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

parents 93ae2d25 001954e1

No related branches found

Tags release_2022-02-17

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

src/App.vue 1 addition, 1 deletion

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

src/components/Definition.vue
src/components/DictionaryView.vue 11 additions, 3 deletions

src/components/DictionaryView.vue
src/components/InflectionButton.vue 6 additions, 3 deletions

src/components/InflectionButton.vue
src/components/Settings.vue 13 additions, 1 deletion

src/components/Settings.vue
src/locales/eng.json 1 addition, 0 deletions

src/locales/eng.json
src/locales/nno.json 1 addition, 0 deletions

src/locales/nno.json
src/locales/nob.json 1 addition, 0 deletions

src/locales/nob.json
src/main.js 7 additions, 1 deletion

src/main.js

with 42 additions and 10 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