merge conflicts
[arvados-workbench2.git] / src / components / icon / icon.tsx
2018-07-23 Pawel Kowalczykmerge conflicts
2018-07-17 Michal KlobukowskiMerge branch '13764-icons-colors-unification-refactoring'
2018-07-17 Janicki ArturMerge branch 'master' into 13764-icons-colors-unificati...
2018-07-17 Janicki Arturchange code after CR
2018-07-17 Janicki Arturadd all icons to icon component, refactor code and...
2018-07-16 Janicki Arturadd all icons and modify items fo details panel
2018-07-16 Janicki Arturclean code after CR
2018-07-16 Janicki Arturimprove attributes and dt-factory, modify side-panel...
2018-07-10 Michal KlobukowskiResolve merge conflicts
2018-07-10 Michal KlobukowskiMerge branch '13765-information-inside-details-panel'
2018-07-10 Janicki ArturMerge branch 'master' into 13765-information-inside...
2018-07-10 Michal Klobukowskimerge changes
2018-07-10 Janicki Arturadd enum for icons types
2018-07-10 Janicki Arturmodify icon component
2018-07-10 Janicki Arturcreate re-usable components: attribute, empty-state...