Commit graph

2 commits

Author SHA1 Message Date
Tobias Reski
30c4e4879b Merge branch 'master' into US-166/location-permission
# Conflicts:
#	TINK/TINK/View/Map/MapPage.xaml.cs
#	TINKLib/ViewModel/Map/MapPageViewModel.cs
#	TestFramework/Services/Permissions/PermissionsMock.cs
#	TestTINKLib/TestTINKLib.csproj
2021-11-15 10:06:55 +01:00
ohauff
4bccfe740b Version 3.0.261 2021-11-14 23:27:29 +01:00
Renamed from TestTINKLib/Fixtures/UseCases/Startup/TestTinkApp.cs (Browse further)