sharee.bike-App/Meinkonrad/TINK.Android
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
..
Assets Version 3.0.255 2021-11-07 19:42:59 +01:00
Model/Device Version 3.0.255 2021-11-07 19:42:59 +01:00
Properties Version 3.0.261 2021-11-14 23:27:29 +01:00
Resources Removed legacy permission lib and updated code to use essentials lib. 2021-11-15 09:51:06 +01:00
Services/BluetoothLock/Arendi Version 3.0.255 2021-11-07 19:42:59 +01:00
app.config Version 3.0.255 2021-11-07 19:42:59 +01:00
MainActivity.cs Version 3.0.260 2021-11-07 21:28:13 +01:00
Meinkonrad.Android.csproj Version 3.0.260 2021-11-07 21:28:13 +01:00