Skip to content
Snippets Groups Projects
Commit 2e04b542 authored by lotte's avatar lotte
Browse files

Merge branch 'w2p-49440_Date-widget' into w2p-49440_date-widget-for-search-features

Conflicts:
	package.json
	src/app/+search-page/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
	src/app/+search-page/search-filters/search-filter/search-filter.component.html
	src/app/+search-page/search-page.component.ts
	src/app/+search-page/search-page.module.ts
	src/app/shared/shared.module.ts
parents 4d538cab fd916501
No related branches found
No related tags found
No related merge requests found
Showing
with 557 additions and 15 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 to comment