Merge branch 'master' into leia

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

View File

@ -1,7 +1,5 @@
# Backup Addon # Backup Addon
[![Build Status](https://travis-ci.org/robweber/xbmcbackup.svg?branch=leia)](https://travis-ci.org/robweber/xbmcbackup) ![Kodi Version](https://img.shields.io/endpoint?url=https%3A%2F%2Fweberjr.com%2Fkodi-shield%2Frobweber%2Fxbmcbackup%2Fmaster%2Ftrue%2Ftrue) [![Build Status](https://img.shields.io/travis/robweber/xbmcbackup/master)](https://travis-ci.org/robweber/xbmcbackup) [![License](https://img.shields.io/github/license/robweber/xbmcbackup)](https://github.com/robweber/xbmcbackup/blob/master/LICENSE.txt)
__Kodi Version Compatibility:__ Kodi 18.x (Leia) and greater
## About ## About

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/) 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 ### Added