Merge branch 'release-4.1.0'

This commit is contained in:
Daniel Kraus
2017-08-25 19:31:40 +02:00
5 changed files with 81 additions and 43 deletions

View File

@ -17,11 +17,14 @@ This extension is [semantically versioned](http://semver.org).
Contributing
------------
If you wish to contribute, please issue pull requests against the `develop`
branch, as I follow Vincent Driessen's advice on [A successful Git branching
model](http://nvie.com/git-model) (knowing that there are [alternative
If you wish to contribute, please issue pull requests against the `develop`
branch, as I follow Vincent Driessen's advice on [A successful Git branching
model](http://nvie.com/git-model) (knowing that there are [alternative
workflows](http://scottchacon.com/2011/08/31/github-flow.html)).
The `master` branch contains stable releases only, so it is safe to pull the
master branch if you want to install the extension for your own wiki.
Contributors
------------