Merge branch 'feature-new' into dev

a69090c2 · 王云帆 · 346933c3 · 898eacd5 · a69090c2
Commit a69090c2 authored Sep 28, 2019 by 王云帆
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

.gitignore .gitignore +1 -0

No files found.
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@ yarn-error.log*
 test/unit/coverage
 test/e2e/reports
 selenium-debug.log
+.prettierrc.json
 # Editor directories and files
 .idea