Merge remote-tracking branch 'refs/remotes/origin/master' into develop

This commit is contained in:
angelblue05 2016-07-04 14:32:40 -05:00
commit a6995c9b8f

View file

@ -3,5 +3,5 @@
Thanks you for contributing to Emby for Kodi!
* Please make pull requests towards the **develop** branch, not the master branch.
* Try to keep lines shorter than 100 to keep things clean and readable.
* Try to keep the maximum line length shorter than 100 characters to keep things clean and readable.
* Add comments if necessary.