Patrick Barron 42b4f0aa2e Merge branch 'master' into userdb-efcore
# Conflicts:
#	Emby.Server.Implementations/Library/UserManager.cs
#	Jellyfin.Data/Jellyfin.Data.csproj
2020-06-13 19:41:05 -04:00
..
2020-06-11 18:28:49 -04:00
2020-06-11 18:28:49 -04:00
2019-10-29 17:55:16 +01:00
2020-05-26 22:43:03 -04:00
2019-04-02 18:17:50 +02:00
2019-10-29 17:55:16 +01:00
2020-06-07 13:36:43 -04:00
2019-10-15 17:49:49 +02:00
2020-02-23 10:53:51 +01:00
2019-10-15 17:49:49 +02:00
2020-05-26 22:43:03 -04:00
2020-03-24 16:12:06 +01:00
2020-03-24 16:12:06 +01:00
2020-02-20 15:30:04 +01:00
2019-10-15 17:49:49 +02:00
2019-10-15 17:49:49 +02:00
2019-10-15 17:49:49 +02:00
2020-05-20 13:07:53 -04:00
2019-10-15 17:49:49 +02:00