Merge branch 'patch-1' of git://github.com/ediri/ng2-file-upload into ediri-patch-1

Conflicts: .npmignore
2017-01-17 15:57:45 +02:00
parent 34c0d35c9c 63bf587d80
commit 35448680b2
2 changed files with 5 additions and 3 deletions
--- a/.npmignore
+++ b/.npmignore
@@ -24,4 +24,4 @@ webpack.config.js

 # AoT generated files
 factories
-/**/*.ngfactory.ts
+/**/*.ngfactory.ts