forked from USStateDept/State-TalentMAP
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'dev' into feature/bidder-portfolio-edit-view
* dev: Use aria-label to describe the meaning of the icon (#149) New card design for Bidder Portfolio (#140) Use defaultSort prop instead of entire object; refresh state value on componentWillReceiveProps() (#148) # Conflicts: # src/Components/BidderPortfolio/ClientBadge/ClientBadge.jsx # src/Components/BidderPortfolio/ClientBadge/__snapshots__/ClientBadge.test.jsx.snap # src/sass/_bidderPortfolio.scss
- Loading branch information
Showing
4 changed files
with
28 additions
and
17 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 2 additions & 1 deletion
3
src/Components/BidderPortfolio/ClientBadge/__snapshots__/ClientBadge.test.jsx.snap
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters