Merge branch 'master' into leia

# Conflicts:
#	README.md
This commit is contained in:
Rob Weber
2019-10-10 11:37:57 -05:00
2 changed files with 6 additions and 4 deletions

View File

@@ -4,7 +4,11 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
## [Unreleased]
## [Unreleased](https://github.com/robweber/xbmcbackup/compare/krypton-1.5.2...HEAD)
### Added
- added new badges for Kodi Version, TravisCI and license information from shields.io
### Added