Skip to content

Commit f0ab5be

Browse files
committed
Merge branch 'master' into feature/rewrite-urls
2 parents 0246ade + 8e814c7 commit f0ab5be

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+24094
-266
lines changed

.editorconfig

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# @see http://editorconfig.org/
2+
3+
# the buck stops here
4+
root = true
5+
6+
# all files
7+
[*]
8+
end_of_line = LF
9+
indent_style = space
10+
indent_size = 4
11+
charset = utf-8
12+
trim_trailing_whitespace = true
13+
insert_final_newline = true

.eslintignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
Gruntfile.js
1+
Gruntfile.js
2+
test/browser/vendor/*

0 commit comments

Comments
 (0)