Merge remote-tracking branch 'origin/feature/upgrade' into feature/upgrade

Browse Source

# Conflicts:
#	package-lock.json
#	package.json
#	src/frontend/app/ui/frame/frame.component.html
#	src/frontend/app/ui/gallery/lightbox/lightbox.gallery.component.ts
#	src/frontend/app/ui/gallery/lightbox/media/media.lightbox.gallery.component.ts
#	src/frontend/app/ui/gallery/map/lightbox/lightbox.map.gallery.component.css
#	src/frontend/app/ui/gallery/search/search-field-base/search-field-base.gallery.component.ts
#	src/frontend/app/ui/gallery/search/search.gallery.component.html
#	src/frontend/app/ui/settings/indexing/indexing.settings.component.html
#	src/frontend/app/ui/settings/jobs/button/job-button.settings.component.html
#	src/frontend/app/ui/settings/other/other.settings.component.html
#	src/frontend/app/ui/settings/preview/preview.settings.component.html
#	src/frontend/app/ui/settings/thumbnail/thumbnail.settings.component.html
#	src/frontend/app/ui/settings/usermanager/usermanager.settings.component.html
#	src/frontend/app/ui/settings/video/video.settings.component.html

...

This commit is contained in:

Patrik J. Braun 2022-04-14 14:52:14 +02:00

parent 8d13af48b0 78190a0acb

commit 8571c95b45

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available