home
Merge branch 'master' of https://github.com/sabkent/LoanShark.Seb

Conflicts:
	LoanShark.AccountManagement.Site/LoanShark.AccountManagement.Site.csproj
	LoanShark.AccountManagement.Site/Startup.cs
	LoanShark.AccountManagement.Site/bin/LoanShark.AuthenticationProvider.dll
	LoanShark.AccountManagement.Site/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	LoanShark.AccountManagement.Site/packages.config
	LoanShark.AuthenticationProvider/AppBuilderExtensions.cs
	LoanShark.AuthenticationProvider/LoanShark.AuthenticationProvider.csproj
	LoanShark.AuthenticationProvider/LoanSharkAuthenticationHandler.cs
	LoanShark.AuthenticationProvider/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	LoanShark.v12.suo
	packages/Microsoft.Owin.Host.SystemWeb.2.1.0/lib/net40/Microsoft.Owin.Host.SystemWeb.xml
	packages/Microsoft.Owin.Host.SystemWeb.2.1.0/lib/net45/Microsoft.Owin.Host.SystemWeb.xml
merge down to home pc
Merge branch 'master' of https://github.com/sabkent/LoanShark.Seb

Conflicts:
	LoanShark.AccountManagement.Site/bin/LoanShark.AccountManagement.Site.dll
	LoanShark.AccountManagement.Site/bin/LoanShark.AccountManagement.Site.pdb
	LoanShark.AccountManagement.Site/bin/LoanShark.AuthenticationProvider.dll
	LoanShark.AccountManagement.Site/bin/LoanShark.AuthenticationProvider.pdb
	LoanShark.AccountManagement.Site/bin/Newtonsoft.Json.xml
	LoanShark.AccountManagement.Site/obj/Debug/LoanShark.AccountManagement.Site.csproj.FileListAbsolute.txt
	LoanShark.AccountManagement.Site/obj/Debug/LoanShark.AccountManagement.Site.csprojResolveAssemblyReference.cache
	LoanShark.AccountManagement.Site/obj/Debug/LoanShark.AccountManagement.Site.dll
	LoanShark.AccountManagement.Site/obj/Debug/LoanShark.AccountManagement.Site.pdb
	LoanShark.Api/bin/LoanShark.Api.dll
	LoanShark.Api/bin/LoanShark.Api.pdb
	LoanShark.Api/bin/LoanShark.Application.dll
	LoanShark.Api/bin/LoanShark.Application.pdb
	LoanShark.Api/bin/LoanShark.AuthenticationProvider.dll
	LoanShark.Api/bin/LoanShark.AuthenticationProvider.pdb
	LoanShark.Api/bin/LoanShark.Core.dll
	LoanShark.Api/bin/LoanShark.Core.pdb
	LoanShark.Api/bin/LoanShark.Messaging.dll
	LoanShark.Api/bin/LoanShark.Messaging.pdb
	LoanShark.Api/obj/Debug/LoanShark.Api.csproj.FileListAbsolute.txt
	LoanShark.Api/obj/Debug/LoanShark.Api.csprojResolveAssemblyReference.cache
	LoanShark.Api/obj/Debug/LoanShark.Api.dll
	LoanShark.Api/obj/Debug/LoanShark.Api.pdb
	LoanShark.Application/bin/Debug/LoanShark.Application.dll
	LoanShark.Application/bin/Debug/LoanShark.Application.pdb
	LoanShark.Application/bin/Debug/LoanShark.Core.dll
	LoanShark.Application/bin/Debug/LoanShark.Core.pdb
	LoanShark.Application/bin/Debug/LoanShark.Messaging.ClientSide.dll
	LoanShark.Application/bin/Debug/LoanShark.Messaging.ClientSide.pdb
	LoanShark.Application/bin/Debug/LoanShark.Messaging.dll
	LoanShark.Application/bin/Debug/LoanShark.Messaging.pdb
	LoanShark.Application/obj/Debug/LoanShark.Application.csprojResolveAssemblyReference.cache
	LoanShark.Application/obj/Debug/LoanShark.Application.dll
	LoanShark.Application/obj/Debug/LoanShark.Application.pdb
	LoanShark.AuthenticationProvider/bin/Debug/LoanShark.AuthenticationProvider.dll
	LoanShark.AuthenticationProvider/bin/Debug/LoanShark.AuthenticationProvider.pdb
	LoanShark.AuthenticationProvider/obj/Debug/LoanShark.AuthenticationProvider.csprojResolveAssemblyReference.cache
	LoanShark.AuthenticationProvider/obj/Debug/LoanShark.AuthenticationProvider.dll
	LoanShark.AuthenticationProvider/obj/Debug/LoanShark.AuthenticationProvider.pdb
	LoanShark.AuthenticationServer/bin/LoanShark.AuthenticationProvider.dll
	LoanShark.AuthenticationServer/bin/LoanShark.AuthenticationProvider.pdb
	LoanShark.AuthenticationServer/bin/LoanShark.AuthenticationServer.dll
	LoanShark.AuthenticationServer/bin/LoanShark.AuthenticationServer.pdb
	LoanShark.AuthenticationServer/obj/Debug/LoanShark.AuthenticationServer.csprojResolveAssemblyReference.cache
	LoanShark.AuthenticationServer/obj/Debug/LoanShark.AuthenticationServer.dll
	LoanShark.AuthenticationServer/obj/Debug/LoanShark.AuthenticationServer.pdb
	LoanShark.Banking.Site/bin/LoanShark.Banking.Site.dll
	LoanShark.Banking.Site/bin/LoanShark.Banking.Site.pdb
	LoanShark.Banking.Site/obj/Debug/LoanShark.Banking.Site.csprojResolveAssemblyReference.cache
	LoanShark.Banking.Site/obj/Debug/LoanShark.Banking.Site.dll
	LoanShark.Banking.Site/obj/Debug/LoanShark.Banking.Site.pdb
	LoanShark.Core/bin/Debug/LoanShark.Core.dll
	LoanShark.Core/bin/Debug/LoanShark.Core.pdb
	LoanShark.Core/obj/Debug/LoanShark.Core.csproj.FileListAbsolute.txt
	LoanShark.Core/obj/Debug/LoanShark.Core.dll
	LoanShark.Core/obj/Debug/LoanShark.Core.pdb
	LoanShark.Infrastructure/bin/Debug/LoanShark.Application.dll
	LoanShark.Infrastructure/bin/Debug/LoanShark.Application.pdb
	LoanShark.Infrastructure/bin/Debug/LoanShark.Core.dll
	LoanShark.Infrastructure/bin/Debug/LoanShark.Core.pdb
	LoanShark.Infrastructure/bin/Debug/LoanShark.Infrastructure.dll
	LoanShark.Infrastructure/bin/Debug/LoanShark.Infrastructure.pdb
	LoanShark.Infrastructure/bin/Debug/LoanShark.Messaging.dll
	LoanShark.Infrastructure/bin/Debug/LoanShark.Messaging.pdb
	LoanShark.Infrastructure/obj/Debug/LoanShark.Infrastructure.csprojResolveAssemblyReference.cache
	LoanShark.Infrastructure/obj/Debug/LoanShark.Infrastructure.dll
	LoanShark.Infrastructure/obj/Debug/LoanShark.Infrastructure.pdb
	LoanShark.Messaging.ClientSide/bin/Debug/LoanShark.Messaging.ClientSide.dll
	LoanShark.Messaging.ClientSide/bin/Debug/LoanShark.Messaging.ClientSide.pdb
	LoanShark.Messaging.ClientSide/obj/Debug/LoanShark.Messaging.ClientSide.csprojResolveAssemblyReference.cache
	LoanShark.Messaging.ClientSide/obj/Debug/LoanShark.Messaging.ClientSide.dll
	LoanShark.Messaging.ClientSide/obj/Debug/LoanShark.Messaging.ClientSide.pdb
	LoanShark.Messaging.EasyNetQ/bin/Debug/LoanShark.Core.dll
	LoanShark.Messaging.EasyNetQ/bin/Debug/LoanShark.Core.pdb
	LoanShark.Messaging.EasyNetQ/bin/Debug/LoanShark.Messaging.EasyNetQ.dll
	LoanShark.Messaging.EasyNetQ/bin/Debug/LoanShark.Messaging.EasyNetQ.pdb
	LoanShark.Messaging.EasyNetQ/bin/Debug/LoanShark.Messaging.dll
	LoanShark.Messaging.EasyNetQ/bin/Debug/LoanShark.Messaging.pdb
	LoanShark.Messaging.EasyNetQ/obj/Debug/LoanShark.Messaging.EasyNetQ.csprojResolveAssemblyReference.cache
	LoanShark.Messaging.EasyNetQ/obj/Debug/LoanShark.Messaging.EasyNetQ.dll
	LoanShark.Messaging.EasyNetQ/obj/Debug/LoanShark.Messaging.EasyNetQ.pdb
	LoanShark.Messaging.Host/bin/Debug/LoanShark.Application.dll
	LoanShark.Messaging.Host/bin/Debug/LoanShark.Application.pdb
	LoanShark.Messaging.Host/bin/Debug/LoanShark.Core.dll
	LoanShark.Messaging.Host/bin/Debug/LoanShark.Core.pdb
	LoanShark.Messaging.Host/bin/Debug/LoanShark.Infrastructure.dll
	LoanShark.Messaging.Host/bin/Debug/LoanShark.Infrastructure.pdb
	LoanShark.Messaging.Host/bin/Debug/LoanShark.Messaging.EasyNetQ.dll
	LoanShark.Messaging.Host/bin/Debug/LoanShark.Messaging.EasyNetQ.pdb
	LoanShark.Messaging.Host/bin/Debug/LoanShark.Messaging.Host.exe
	LoanShark.Messaging.Host/bin/Debug/LoanShark.Messaging.Host.pdb
	LoanShark.Messaging.Host/bin/Debug/LoanShark.Messaging.dll
	LoanShark.Messaging.Host/bin/Debug/LoanShark.Messaging.pdb
	LoanShark.Messaging.Host/obj/Debug/LoanShark.Messaging.Host.csprojResolveAssemblyReference.cache
	LoanShark.Messaging.Host/obj/Debug/LoanShark.Messaging.Host.exe
	LoanShark.Messaging.Host/obj/Debug/LoanShark.Messaging.Host.pdb
	LoanShark.Messaging.RabbitMQ/bin/Debug/LoanShark.Application.dll
	LoanShark.Messaging.RabbitMQ/bin/Debug/LoanShark.Application.pdb
	LoanShark.Messaging.RabbitMQ/bin/Debug/LoanShark.Core.dll
	LoanShark.Messaging.RabbitMQ/bin/Debug/LoanShark.Core.pdb
	LoanShark.Messaging.RabbitMQ/bin/Debug/LoanShark.Messaging.RabbitMQ.dll
	LoanShark.Messaging.RabbitMQ/bin/Debug/LoanShark.Messaging.RabbitMQ.pdb
	LoanShark.Messaging.RabbitMQ/bin/Debug/LoanShark.Messaging.dll
	LoanShark.Messaging.RabbitMQ/bin/Debug/LoanShark.Messaging.pdb
	LoanShark.Messaging.RabbitMQ/obj/Debug/LoanShark.Messaging.RabbitMQ.csprojResolveAssemblyReference.cache
	LoanShark.Messaging.RabbitMQ/obj/Debug/LoanShark.Messaging.RabbitMQ.dll
	LoanShark.Messaging.RabbitMQ/obj/Debug/LoanShark.Messaging.RabbitMQ.pdb
	LoanShark.Messaging/bin/Debug/LoanShark.Core.dll
	LoanShark.Messaging/bin/Debug/LoanShark.Core.pdb
	LoanShark.Messaging/bin/Debug/LoanShark.Messaging.dll
	LoanShark.Messaging/bin/Debug/LoanShark.Messaging.pdb
	LoanShark.Messaging/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	LoanShark.Messaging/obj/Debug/LoanShark.Messaging.csprojResolveAssemblyReference.cache
	LoanShark.Messaging/obj/Debug/LoanShark.Messaging.dll
	LoanShark.Messaging/obj/Debug/LoanShark.Messaging.pdb
	LoanShark.Origination.Site/bin/LoanShark.Application.dll
	LoanShark.Origination.Site/bin/LoanShark.Application.pdb
	LoanShark.Origination.Site/bin/LoanShark.Core.dll
	LoanShark.Origination.Site/bin/LoanShark.Core.pdb
	LoanShark.Origination.Site/bin/LoanShark.Infrastructure.dll
	LoanShark.Origination.Site/bin/LoanShark.Infrastructure.pdb
	LoanShark.Origination.Site/bin/LoanShark.Messaging.ClientSide.dll
	LoanShark.Origination.Site/bin/LoanShark.Messaging.ClientSide.pdb
	LoanShark.Origination.Site/bin/LoanShark.Messaging.EasyNetQ.dll
	LoanShark.Origination.Site/bin/LoanShark.Messaging.EasyNetQ.pdb
	LoanShark.Origination.Site/bin/LoanShark.Messaging.dll
	LoanShark.Origination.Site/bin/LoanShark.Messaging.pdb
	LoanShark.Origination.Site/bin/LoanShark.Origination.Site.dll
	LoanShark.Origination.Site/bin/LoanShark.Origination.Site.pdb
	LoanShark.Origination.Site/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	LoanShark.Origination.Site/obj/Debug/LoanShark.Origination.Site.csprojResolveAssemblyReference.cache
	LoanShark.Origination.Site/obj/Debug/LoanShark.Origination.Site.dll
	LoanShark.Origination.Site/obj/Debug/LoanShark.Origination.Site.pdb
	LoanShark.Tests/Messaging/OctoBusTests.cs
	LoanShark.Tests/bin/Debug/LoanShark.Application.dll
	LoanShark.Tests/bin/Debug/LoanShark.Application.pdb
	LoanShark.Tests/bin/Debug/LoanShark.Core.dll
	LoanShark.Tests/bin/Debug/LoanShark.Core.pdb
	LoanShark.Tests/bin/Debug/LoanShark.Infrastructure.dll
	LoanShark.Tests/bin/Debug/LoanShark.Infrastructure.pdb
	LoanShark.Tests/bin/Debug/LoanShark.Messaging.ClientSide.dll
	LoanShark.Tests/bin/Debug/LoanShark.Messaging.ClientSide.pdb
	LoanShark.Tests/bin/Debug/LoanShark.Messaging.EasyNetQ.dll
	LoanShark.Tests/bin/Debug/LoanShark.Messaging.EasyNetQ.pdb
	LoanShark.Tests/bin/Debug/LoanShark.Messaging.RabbitMQ.dll
	LoanShark.Tests/bin/Debug/LoanShark.Messaging.RabbitMQ.pdb
	LoanShark.Tests/bin/Debug/LoanShark.Messaging.dll
	LoanShark.Tests/bin/Debug/LoanShark.Messaging.pdb
	LoanShark.Tests/bin/Debug/LoanShark.Origination.Site.dll
	LoanShark.Tests/bin/Debug/LoanShark.Origination.Site.pdb
	LoanShark.Tests/bin/Debug/LoanShark.Tests.dll
	LoanShark.Tests/bin/Debug/LoanShark.Tests.pdb
	LoanShark.Tests/obj/Debug/LoanShark.Tests.csprojResolveAssemblyReference.cache
	LoanShark.Tests/obj/Debug/LoanShark.Tests.dll
	LoanShark.Tests/obj/Debug/LoanShark.Tests.pdb
	LoanShark.UI/bin/Debug/LoanShark.UI.dll
	LoanShark.UI/bin/Debug/LoanShark.UI.pdb
	LoanShark.UI/obj/Debug/LoanShark.UI.csprojResolveAssemblyReference.cache
	LoanShark.UI/obj/Debug/LoanShark.UI.dll
	LoanShark.UI/obj/Debug/LoanShark.UI.pdb
	LoanShark.v12.suo
home PC