Skip to content

Commit 9935ac6

Browse files
committed
Merge branch 'dev'
2 parents 0694ac2 + 7f7d42b commit 9935ac6

17 files changed

+57
-71
lines changed

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ root = true
22

33
[*]
44
charset = utf-8
5-
indent_style = tab
5+
indent_style = space
66
trim_trailing_whitespace = false
77
end_of_line = lf
88
insert_final_newline = true

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
![license](https://img.shields.io/github/license/pattern-lab/styleguidekit-assets-default.svg?maxAge=2592000)
2-
[![Packagist](https://img.shields.io/packagist/v/pattern-lab/styleguidekit-assets-default.svg?maxAge=2592000)](https://packagist.org/packages/pattern-lab/patternengine-mustache) [![Gitter](https://img.shields.io/gitter/room/pattern-lab/front-end.svg?maxAge=2592000)](https://gitter.im/pattern-lab/frontend-viewer)
1+
![license](https://img.shields.io/github/license/pattern-lab/styleguidekit-assets-default.svg)
2+
[![Packagist](https://img.shields.io/packagist/v/pattern-lab/styleguidekit-assets-default.svg)](https://packagist.org/packages/pattern-lab/styleguidekit-assets-default) [![Gitter](https://img.shields.io/gitter/room/pattern-lab/frontend-viewer.svg)](https://gitter.im/pattern-lab/frontend-viewer)
33

44
# Static Assets for the Default StyleguideKit
55

dist/styleguide/bower_components/EventEmitter.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/styleguide/bower_components/classList.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/styleguide/bower_components/hogan-3.0.2.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/styleguide/bower_components/jquery.min.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/styleguide/bower_components/jwerty.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)