Merge branch '1-ta-inn-endringer-fra-skeivt-arkiv-lodspeakr' into 'master' (30478625) · Commits · uib-ub / Spesialsamlingene / marcus-lodspeakr

Commit 30478625 authored 3 years ago by Oyvind.Gjesdal

Merge branch '1-ta-inn-endringer-fra-skeivt-arkiv-lodspeakr' into 'master'

Resolve "Ta inn endringer fra skeivt arkiv lodspeakr"

Closes #1

See merge request !1

parents 8b2d9e0d 78905cc2

No related branches found

No related tags found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

components/static/js/bootstrap-typeahead.js.bck 0 additions, 311 deletions

components/static/js/bootstrap-typeahead.js.bck
components/static/js/bootstrap.js 0 additions, 1825 deletions

components/static/js/bootstrap.js
components/static/js/bootstrap.min.js 0 additions, 6 deletions

components/static/js/bootstrap.min.js
components/static/js/bower_components/openseadragon/.bower.json 0 additions, 48 deletions

...ents/static/js/bower_components/openseadragon/.bower.json
components/static/js/bower_components/openseadragon/bower.json 0 additions, 38 deletions

...nents/static/js/bower_components/openseadragon/bower.json
components/static/js/bower_components/openseadragon/bower_components/openseadragon/.bower.json 0 additions, 47 deletions

.../openseadragon/bower_components/openseadragon/.bower.json
components/static/js/bower_components/openseadragon/bower_components/openseadragon/bower.json 0 additions, 38 deletions

...s/openseadragon/bower_components/openseadragon/bower.json
components/static/js/bower_components/openseadragon/bower_components/openseadragon/built-openseadragon/openseadragon/images/fullpage_grouphover.png 0 additions, 0 deletions

...penseadragon/openseadragon/images/fullpage_grouphover.png
components/static/js/bower_components/openseadragon/bower_components/openseadragon/built-openseadragon/openseadragon/images/fullpage_hover.png 0 additions, 0 deletions

...ilt-openseadragon/openseadragon/images/fullpage_hover.png
components/static/js/bower_components/openseadragon/bower_components/openseadragon/built-openseadragon/openseadragon/images/fullpage_pressed.png 0 additions, 0 deletions

...t-openseadragon/openseadragon/images/fullpage_pressed.png
components/static/js/bower_components/openseadragon/bower_components/openseadragon/built-openseadragon/openseadragon/images/fullpage_rest.png 0 additions, 0 deletions

...uilt-openseadragon/openseadragon/images/fullpage_rest.png
components/static/js/bower_components/openseadragon/bower_components/openseadragon/built-openseadragon/openseadragon/images/home_grouphover.png 0 additions, 0 deletions

...lt-openseadragon/openseadragon/images/home_grouphover.png
components/static/js/bower_components/openseadragon/bower_components/openseadragon/built-openseadragon/openseadragon/images/home_hover.png 0 additions, 0 deletions

...n/built-openseadragon/openseadragon/images/home_hover.png
components/static/js/bower_components/openseadragon/bower_components/openseadragon/built-openseadragon/openseadragon/images/home_pressed.png 0 additions, 0 deletions

...built-openseadragon/openseadragon/images/home_pressed.png
components/static/js/bower_components/openseadragon/bower_components/openseadragon/built-openseadragon/openseadragon/images/home_rest.png 0 additions, 0 deletions

...on/built-openseadragon/openseadragon/images/home_rest.png
components/static/js/bower_components/openseadragon/bower_components/openseadragon/built-openseadragon/openseadragon/images/next_grouphover.png 0 additions, 0 deletions

...lt-openseadragon/openseadragon/images/next_grouphover.png
components/static/js/bower_components/openseadragon/bower_components/openseadragon/built-openseadragon/openseadragon/images/next_hover.png 0 additions, 0 deletions

...n/built-openseadragon/openseadragon/images/next_hover.png
components/static/js/bower_components/openseadragon/bower_components/openseadragon/built-openseadragon/openseadragon/images/next_pressed.png 0 additions, 0 deletions

...built-openseadragon/openseadragon/images/next_pressed.png
components/static/js/bower_components/openseadragon/bower_components/openseadragon/built-openseadragon/openseadragon/images/next_rest.png 0 additions, 0 deletions

...on/built-openseadragon/openseadragon/images/next_rest.png
components/static/js/bower_components/openseadragon/bower_components/openseadragon/built-openseadragon/openseadragon/images/previous_grouphover.png 0 additions, 0 deletions

...penseadragon/openseadragon/images/previous_grouphover.png

with 0 additions and 2313 deletions

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

Please register or to comment