Merge branch 'hotfix/3.2.10' into develop

This commit is contained in:
Michael Rose 2016-06-21 14:51:54 -04:00
commit 8dbf7fc80e
3 changed files with 18 additions and 1 deletions

11
.github/CONTRIBUTING.md vendored Normal file
View file

@ -0,0 +1,11 @@
# Contributing
Having trouble working with the theme? Found a typo in the documentation? Interested in adding a feature or [fixing a bug](https://github.com/mmistakes/minimal-mistakes/issues)? Then by all means [submit an issue](https://github.com/mmistakes/minimal-mistakes/issues/new) or [pull request](https://help.github.com/articles/using-pull-requests/). If this is your first pull request, it may be helpful to read up on the [GitHub Flow](https://guides.github.com/introduction/flow/) first.
Minimal Mistakes has been designed as a base for you to customize and fit your site's unique needs. Please keep this in mind when requesting features and/or submitting pull requests. If it's not something that most people will use, I probably won't consider it. When in doubt ask.
This goes for author sidebar links and "share button" additions -- I have no intention of merging in every possibly option, the essentials are there to get you started :smile:.
## Pull Requests
To help me out try to avoid creating pull requests on `master` and instead branch off of `develop`. It's much easier for me to test, merge, and roll them into new releases this way.

View file

@ -1,3 +1,9 @@
## [3.2.10](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.2.10)
## Maintenance
- Add `CONTRIBUTING.md`
## [3.2.9](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.2.9) ## [3.2.9](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.2.9)
### Enhancements ### Enhancements

View file

@ -1,6 +1,6 @@
{ {
"name": "minimal-mistakes", "name": "minimal-mistakes",
"version": "3.2.9", "version": "3.2.10",
"description": "Minimal Mistakes Jekyll theme npm build scripts", "description": "Minimal Mistakes Jekyll theme npm build scripts",
"repository": { "repository": {
"type": "git", "type": "git",