Commit Graph

4 Commits

Author SHA1 Message Date
Lotte Hofstede
2895bb61e8 fixed list element tests 2018-02-13 15:06:07 +01:00
Lotte Hofstede
42b315f8fb 46063: clean up 2018-02-05 12:51:36 +01:00
Lotte Hofstede
136edddbdd Merge branch 'master' into w2p-46063_truncation-implementation
Conflicts:
	src/app/object-list/item-list-element/item-list-element.component.ts
	src/app/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.scss
	src/app/shared/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.ts
	src/styles/_custom_variables.scss
	src/styles/_mixins.scss
2018-01-23 10:27:25 +01:00
Jonas Van Goolen
520b7f3e12 #150 Moved list,grid and object-collection to shared package 2017-12-01 09:59:35 +01:00