Merge branch 'FLUID-5458-2.0' into FLUID-5249

Conflicts: .npmignore
fluid-project · Aug 11, 2015 · c7b4c51 · c7b4c51
2 parents f42fce0 + 7d83779
commit c7b4c51
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/.npmignore b/.npmignore
@@ -5,16 +5,14 @@ demos
 examples
 Gruntfile.js
 products
-project.xml
-project.properties
-pom.xml
 
 src/components
 src/lib/fonts
 src/lib/jquery/plugins
 src/lib/jquery/ui
-src/lib/json
+
 src/framework/core/css
+src/framework/preferences
 
 tests/3rd-party-tests
 tests/component-tests