Skip to content

Commit 994648e

Browse files
committed
* Updated README
* Updated CONTRIBUTING guidelines * Added .editorconfig [ci skip]
1 parent 082abcc commit 994648e

File tree

3 files changed

+26
-1
lines changed

3 files changed

+26
-1
lines changed

.editorconfig

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# editorconfig.org
2+
3+
root = true
4+
5+
[*]
6+
indent_style = space
7+
indent_size = 2
8+
end_of_line = lf
9+
charset = utf-8
10+
trim_trailing_whitespace = true
11+
insert_final_newline = true
12+
13+
[*.py]
14+
indent_style = space
15+
indent_size = 4

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ We only accept issues that are bug reports or feature requests. Bugs must be iso
1717

1818
## Key branches
1919

20-
- `master` is the latest, deployed version. **Never pull against this branch.**
20+
- `master` is the latest, deployed version. **Never make pull requests against this branch.**
2121
- `develop` is the official development branch for the next release.
2222

2323
Take a look at [git-flow, A successful Git branching model](http://nvie.com/posts/a-successful-git-branching-model/)

README.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,16 @@ BUNDLE_GEMFILE=$PWD/gemfiles/Gemfile.rails-3.2.x rake
102102

103103

104104

105+
## Contributing
106+
107+
Please read through our [contributing guidelines](CONTRIBUTING.md). Included are directions for opening issues, coding standards, and notes on development.
108+
109+
More over, if your pull request contains patches or features, you must include relevant unit tests.
110+
111+
Editor preferences are available in the [editor config](.editorconfig) for easy use in common text editors. Read more and download plugins at <http://editorconfig.org>.
112+
113+
114+
105115
## Versioning
106116

107117
For transparency and insight into our release cycle, and for striving to maintain backward compatibility, Twbs Less Rails will be maintained under the Semantic Versioning guidelines as much as possible. Twbs Less Rails will not follow Bootstrap's version number.

0 commit comments

Comments
 (0)