Merge branch 'master' into patch-2

2018-03-10 12:05:34 +08:00
parent 7c0cf6d9ec 773eca0e04
commit 5beb114816
12 changed files with 34 additions and 14 deletions
--- a/Node.gitignore
+++ b/Node.gitignore
@@ -59,3 +59,6 @@ typings/

 # parcel-bundler cache (https://parceljs.org/)
 .cache
+
+# next.js build output
+.next