mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-14 18:42:30 +03:00
Code Activity

Merge branch 'master' of github.com:twbs/bootstrap

Browse Source 
Conflicts:
	Gruntfile.js
This commit is contained in:
Mark Otto
2014-03-09 16:11:04 -07:00
parent 2f7b04a192 68b3e3f3be
commit b263a0197b
6 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gruntfile.js
+2 -2
View File
@@ -66,8 +66,8 @@ module.exports = function (grunt) {
},
grunt: {
options: {
'requireCamelCaseOrUpperCaseIdentifiers': null,
'requireParenthesesAroundIIFE': true
requireCamelCaseOrUpperCaseIdentifiers: null,
requireParenthesesAroundIIFE: true
},
src: '<%= jshint.grunt.src %>'
},