Skip to content

Commit

Permalink
Merge branch 'development' into feature/lb-bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
TheLeoB committed Jun 18, 2018
2 parents 60eb308 + 89a8106 commit 9e82f91
Show file tree
Hide file tree
Showing 138 changed files with 11,501 additions and 11,156 deletions.
2 changes: 1 addition & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"jest/valid-expect": 2,
"react/display-name": 0,
"react/forbid-prop-types": 0,
"react/jsx-boolean-value": 1,
"react/jsx-boolean-value": 0,
"react/jsx-closing-bracket-location": 0,
"react/jsx-curly-spacing": 2,
"react/jsx-indent-props": 0,
Expand Down

0 comments on commit 9e82f91

Please sign in to comment.