# Conflicts:
#	src/app/app.reducer.ts
#	src/app/shared/shared.module.ts

Update README with PR testing process & yarn dependency mgmt notes

Truncation

Fix travis chrome issue

fixes an issue where protractor can't find the right chrome version when running in travis, see https://github.com/angular/angular-cli/wiki/stories-continuous-integration#using-travis-ci

Bootstrap upgrade

Fixed search form that did not work without javascript

Fix CSR only issue

Conflicts:
	src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.spec.ts
	src/app/shared/object-grid/community-grid-element/community-grid-element.component.spec.ts
	src/app/shared/object-grid/item-grid-element/item-grid-element.component.spec.ts
	src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.spec.ts
	src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.spec.ts
	src/app/shared/object-grid/search-result-grid-element/item-search-result/item-search-result-grid-element.component.spec.ts

Merge branch 'w2p-46063_truncation-implementation' into w2p-46063_truncation-implementation-test-fixes

Conflicts:
	src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.spec.ts