Merge remote-tracking branch 'twbs/v4-dev' into patch-1

Conflicts:
	scss/_custom-forms.scss
	scss/_variables.scss

1 files changed, 1 insertions, 9 deletions

diff --git a/package.js b/package.js
index 9b98df951..a1a9df1e9 100644
--- a/package.js
+++ b/package.js
@@ -1,12 +1,11 @@
 // package metadata file for Meteor.js
 
-/* jshint strict:false */
 /* global Package:true */
 
 Package.describe({
   name: 'twbs:bootstrap',  // http://atmospherejs.com/twbs/bootstrap
   summary: 'The most popular front-end framework for developing responsive, mobile first projects on the web.',
-  version: '3.3.5',
+  version: '4.0.0-alpha',
   git: 'https://github.com/twbs/bootstrap.git'
 });
 
@@ -14,13 +13,6 @@ Package.onUse(function (api) {
   api.versionsFrom('[email protected]');
   api.use('jquery', 'client');
   api.addFiles([
-    'dist/fonts/glyphicons-halflings-regular.eot',
-    'dist/fonts/glyphicons-halflings-regular.svg',
-    'dist/fonts/glyphicons-halflings-regular.ttf',
-    'dist/fonts/glyphicons-halflings-regular.woff',
-    'dist/fonts/glyphicons-halflings-regular.woff2'
-  ], 'client', { isAsset: true });
-  api.addFiles([
     'dist/css/bootstrap.css',
     'dist/js/bootstrap.js'
   ], 'client');