Skip to content

Commit

Permalink
Merge branch 'develop' into frontend/#43-button-and-link-components
Browse files Browse the repository at this point in the history
  • Loading branch information
vieraboschkova committed Feb 28, 2021
2 parents 68d84f1 + 53060b5 commit 92231ab
Show file tree
Hide file tree
Showing 29 changed files with 1,346 additions and 162 deletions.
7 changes: 7 additions & 0 deletions client/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"extends": "react-app",
"plugins": ["prettier"],
"rules": {
"prettier/prettier": "error"
}
}
5 changes: 5 additions & 0 deletions client/.prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"singleQuote": true,
"trailingComma": "all",
"arrowParens": "always"
}
Loading

0 comments on commit 92231ab

Please sign in to comment.