Merge branch 'release/v1.1.0-rc3'

This commit is contained in:
CJ Patoilo 2016-01-12 02:01:00 -03:00
commit d3b9f9c4bf
10 changed files with 20 additions and 12 deletions

View File

@ -1,5 +1,6 @@
.editorconfig .editorconfig
.gitignore .gitignore
.npmignore
.travis.yml .travis.yml
bower.json bower.json
component.json component.json
@ -7,4 +8,6 @@ composer.json
contributing.md contributing.md
gruntfile.js gruntfile.js
package.js package.js
package.json
src src
test

View File

@ -31,13 +31,15 @@
".gitignore", ".gitignore",
".npmignore", ".npmignore",
".travis.yml", ".travis.yml",
"bower.json",
"component.json", "component.json",
"composer.json", "composer.json",
"contributing.md", "contributing.md",
"gruntfile.js", "gruntfile.js",
"package.js", "package.js",
"package.json", "package.json",
"src" "src",
"test"
], ],
"dependencies": { "dependencies": {
"normalize.css": "latest" "normalize.css": "latest"

View File

@ -32,12 +32,14 @@
".npmignore", ".npmignore",
".travis.yml", ".travis.yml",
"bower.json", "bower.json",
"component.json",
"composer.json", "composer.json",
"contributing.md", "contributing.md",
"gruntfile.js", "gruntfile.js",
"package.js", "package.js",
"package.json", "package.json",
"src" "src",
"test"
], ],
"repo": "milligram/milligram", "repo": "milligram/milligram",
"styles": [ "styles": [

View File

@ -33,11 +33,13 @@
".travis.yml", ".travis.yml",
"bower.json", "bower.json",
"component.json", "component.json",
"composer.json",
"contributing.md", "contributing.md",
"gruntfile.js", "gruntfile.js",
"package.js", "package.js",
"package.json", "package.json",
"src" "src",
"test"
], ],
"dependencies": { "dependencies": {
"normalize.css": "latest" "normalize.css": "latest"

View File

@ -145,6 +145,3 @@ module.exports = function ( grunt ) {
}; };
// Code is Poetry

View File

@ -37,7 +37,9 @@
"contributing.md", "contributing.md",
"gruntfile.js", "gruntfile.js",
"package.js", "package.js",
"src" "package.json",
"src",
"test"
], ],
"dependencies": { "dependencies": {
"normalize.css": "latest" "normalize.css": "latest"

0
test/index.html Normal file
View File