Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into 217-levers
* master: 122 hero (#259) 195 added all Stanford approved fonts (#248) change class for logo to match new naming conventions. (#257) # Conflicts: # core/css/decanter.css - regenerated using mine # core/scss/utilities/mixins/typography/_font-lead.scss - resolved using mine # core/scss/utilities/mixins/typography/_h6.scss - deleted
- Loading branch information