Merge remote-tracking branch 'origin/master' into DotNetCore

merge
This commit is contained in:
Jamie 2018-02-09 14:17:06 +00:00
commit e78d7adcc1
9 changed files with 1806 additions and 2 deletions

View file

@ -1,4 +1,24 @@
<<<<<<< HEAD
=======
!! Version 2.X is not supported anymore. Pleas don't open a issue for the 2.x version.
See https://github.com/tidusjar/Ombi/issues/1455 for more information.
>>>>>>> origin/master
<!---
!! Please use the Support / bug report template, otherwise we will close the Github issue !!