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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.editorconfig
View File

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

2
.gitignore vendored
View File

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

5
.npmignore
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
src package.json
src
test

4
bower.json
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"

6
component.json
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": [
@ -47,4 +49,4 @@
"license", "license",
"readme.md" "readme.md"
] ]
} }

4
composer.json
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"

3
gruntfile.js
View File

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

2
license
View File

@ -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 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 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 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE. SOFTWARE.

4
package.json
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