AverageMarcus/milligram
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'release/v1.1.0-rc3'

Browse Source
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

2
.editorconfig

@ -9,4 +9,4 @@ trim_trailing_whitespace = true
insert_final_newline = true
[*.md]
trim_trailing_whitespace = false
trim_trailing_whitespace = false

2
.gitignore vendored

@ -39,4 +39,4 @@ $RECYCLE.BIN/
*.msi
*.msm
*.msp
*.lnk
*.lnk

5
.npmignore

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

4
bower.json

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

6
component.json

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

4
composer.json

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

3
gruntfile.js

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

2
license

@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
SOFTWARE.

4
package.json

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

0
test/index.html Normal file