netnobody19 437ab80ba2 Merge remote-tracking branch 'origin/master' ... # Conflicts: # .idea/.idea.FWA_MAIN/.idea/dataSources.xml # FWA_MAIN/bin/FWA_MAIN.dll # FWA_MAIN/bin/FWA_MAIN.pdb # FWA_MAIN/obj/Debug/FWA_MAIN.csproj.AssemblyReference.cache # FWA_MAIN/obj/Debug/FWA_MAIN.csproj.CoreCompileInputs.cache # FWA_MAIN/obj/Debug/FWA_MAIN.dll # FWA_MAIN/obj/Debug/FWA_MAIN.pdb		2024-03-28 19:15:03 -04:00
..
Package/PackageTmp	Initial commit	2024-03-20 13:04:27 -04:00
TransformWebConfig	Initial commit	2024-03-20 13:04:27 -04:00
_WPPLastBuildInfo.txt	Initial commit	2024-03-20 13:04:27 -04:00
.NETFramework,Version=v4.7.2.AssemblyAttributes.cs	Initial commit	2024-03-20 13:04:27 -04:00
.NETFramework,Version=v4.8.1.AssemblyAttributes.cs	Initial commit	2024-03-20 13:04:27 -04:00
FWA_MAIN.csproj.AssemblyReference.cache	blablabla	2024-03-28 19:12:34 -04:00
FWA_MAIN.csproj.CopyComplete	Initial commit	2024-03-20 13:04:27 -04:00
FWA_MAIN.csproj.CoreCompileInputs.cache	blablabla	2024-03-28 19:12:34 -04:00
FWA_MAIN.csproj.FileListAbsolute.txt	blablabla	2024-03-28 19:12:34 -04:00
FWA_MAIN.dll	blablabla	2024-03-28 19:12:34 -04:00
FWA_MAIN.pdb	blablabla	2024-03-28 19:12:34 -04:00