Merge branch 'develop' of github.com:resumable2/ng-resumable into dev…

…elop Conflicts: bower.json
flowjs · Jan 11, 2014 · 3ed45ec · 3ed45ec
2 parents 8373a5b + 3a16454
commit 3ed45ec
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/README.md b/README.md
@@ -8,8 +8,7 @@ ng-flow extension is based on [Flow.js](https://github.com/flowjs/flow.js) libra
 Demo: http://flowjs.github.io/ng-flow/
 
 
-### Upgrade ngFlow from v1 to v2
-Read [CHANGELOG.md](blob/master/CHANGELOG.md)
+**Upgrade ngFlow from v1 to v2**, read the [changelog](CHANGELOG.md)
 
 
 How can I install it?

diff --git a/bower.json b/bower.json
@@ -3,8 +3,6 @@
   "version": "2.0.0",
   "ignore": [
     "**/.*",
-    "node_modules",
-    "bower_components",
     "test",
     "samples",
     "build",