Merge pull request #70 from jdnichollsc/master

Sean Perkins · web-flow · commit 7b133b6c30e8 · 2017-11-07T11:00:38.000-05:00
Fix gitignore to include .js files required
diff --git a/.gitignore b/.gitignore
@@ -34,6 +34,9 @@ testem.log
 /typings
 yarn.lock
 *.js
+!symlink.js
+!karma.conf.js
+!protractor.conf.js
 
 # e2e
 /e2e/*.js
diff --git a/nativescript/.gitignore b/nativescript/.gitignore
@@ -8,6 +8,9 @@ app/**/*
 !app/vendor-platform.ios.ts
 !app/vendor.ts
 
+!gulpfile.js
+!webpack.config.js
+
 src/app
 src/assets
 src/node_modules
diff --git a/src/fonts/README.md b/src/fonts/README.md
@@ -0,0 +1,2 @@
+# Custom fonts
+You can add your *.ttf files into this folder to include custom fonts

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+# Custom fonts`
	`2`	`+You can add your *.ttf files into this folder to include custom fonts`