msft-calculator

github/msft-calculator

Fork 0

mirror of https://github.com/Microsoft/calculator.git synced 2025-08-22 14:13:30 -07:00

Commit graph

Select branches

Hide pull requests

add-internal-ci

fabricbot-configuration-migration

feature/UICSharpCalculator

feature/csvm

feature/viewmodel-csharp

feature/winui2.6

main

mcooley-lochandoff2023-06-09

mcooley/rename-main-branch

mcooley/ui-tests-on-win11

onboarding-prIssueManagement

qualtimi/AeroUpdate

release/1902

release/1903

release/1904

release/1905

release/1906

release/2005

release/2007

release/2008

release/2009

release/2010

release/2011

release/2012

release/2101

release/2102

release/2103

release/2109

release/2109-1

release/2110

release/2112

release/2201

release/2203

release/2204

release/2205

release/2206

release/2207

release/2208

release/2209

release/2210

release/2304

release/2307

release/2312

release/2401

release/2403

release/2405

release/2409

release/2411

release/2501

release/2502

revert-1337-CompilerFlag

u/tilia/ci

u/tilia/relstage

u/tilia/render

u/zhangh/cp

u/zhangh/test-ut

users/merlinbot/1es-pt-auto-baselining-pr

volkcor/UpdateMain2407

volkcor/UpdateMain2503

volkcor/UpdateMain2506

volkcor/UpdateMainto2410

volkcor/UpdateMainto2412

#10

#100

#101

#1010

#1012

#1014

#1016

#1021

#1022

#1023

#1024

#1026

#1027

#1028

#1032

#1036

#1037

#1038

#1039

#104

#1041

#1042

#1046

#1047

#1049

#1051

#1054

#1055

#1056

#1057

#1058

#1059

#106

#1060

#1061

#1062

#1064

#1065

#1067

#1073

#1074

#1075

#1076

#1078

#1079

#1081

#1082

#1084

#1085

#1086

#1087

#1088

#1089

#1090

#1091

#1092

#1093

#1094

#1096

#1097

#1098

#1099

#11

#110

#1100

#1105

#1106

#1107

#1108

#1109

#1113

#1114

#1115

#1116

#1117

#1120

#1121

#1133

#1134

#1136

#1141

#1142

#1145

#1146

#1147

#1148

#1149

#1152

#1154

#1155

#1156

#1157

#1159

#1161

#1162

#1163

#1166

#1167

#118

#1183

#1195

#1196

#1197

#1199

#12

#1201

#1202

#1203

#1206

#1208

#1209

#121

#1210

#1211

#1213

#1214

#1215

#1217

#1219

#1220

#1221

#1223

#1224

#1225

#1226

#1227

#1228

#1229

#1230

#1231

#1233

#1234

#1235

#1236

#1239

#124

#1242

#1243

#1247

#1249

#125

#1250

#1253

#1254

#1256

#1257

#1258

#1259

#126

#1260

#1261

#1262

#1263

#1264

#1265

#1266

#1270

#1271

#1272

#1273

#1285

#1286

#1289

#129

#13

#1300

#1302

#1306

#1307

#1309

#131

#1312

#1313

#1315

#1316

#1317

#132

#1321

#1322

#1324

#1329

#1330

#1332

#1333

#1334

#1336

#1337

#1338

#134

#1342

#1343

#1344

#1346

#1347

#1348

#135

#1353

#1354

#1356

#1357

#1358

#1359

#136

#1362

#1363

#1364

#1365

#137

#1370

#1373

#1374

#1375

#1376

#1393

#1394

#1395

#14

#1400

#1401

#1402

#1403

#1408

#1410

#1411

#1412

#1413

#1415

#1416

#1419

#1421

#1422

#1423

#1424

#1426

#1427

#1428

#1429

#1430

#1431

#1432

#1434

#1439

#144

#1442

#1444

#1445

#1447

#1448

#1449

#145

#1452

#1453

#1455

#1457

#1458

#1459

#146

#1465

#1466

#1467

#1468

#1469

#1470

#1471

#1478

#1482

#1483

#1484

#1485

#1486

#1487

#1488

#15

#1504

#1505

#151

#1510

#1511

#1512

#1513

#1516

#1517

#1518

#1521

#1523

#1525

#1529

#1531

#1536

#1538

#1539

#1542

#1544

#1546

#1547

#1549

#1550

#1551

#1552

#1553

#1556

#1558

#1559

#156

#1561

#1563

#1564

#1565

#1566

#1567

#1570

#1571

#1572

#1573

#1574

#1575

#1576

#1578

#1579

#158

#1580

#1582

#1585

#1586

#1589

#159

#1591

#1595

#1596

#1597

#1598

#1599

#16

#160

#1602

#1605

#1608

#1610

#1613

#1615

#1616

#1618

#1619

#1620

#1621

#1622

#1623

#1626

#1628

#1631

#1632

#1633

#1635

#1638

#1641

#1642

#1643

#165

#1653

#1654

#1655

#1656

#1657

#1659

#166

#1660

#1661

#1662

#1663

#1677

#1679

#1680

#1682

#1683

#1684

#1686

#1687

#1689

#1692

#1698

#1699

#17

#1700

#1701

#1702

#1703

#1704

#1705

#1706

#1707

#1708

#1709

#171

#1710

#1711

#1715

#1717

#1718

#1720

#1721

#1722

#1727

#1728

#1729

#1733

#1737

#1738

#1741

#1743

#1745

#1746

#1750

#1754

#176

#1760

#1761

#1762

#1766

#1768

#1770

#1771

#1773

#1778

#1781

#1783

#1784

#1785

#1786

#1787

#1791

#1793

#1794

#1795

#1797

#1798

#1799

#18

#1800

#1801

#1802

#1803

#1805

#1811

#1812

#1815

#1818

#1819

#182

#1820

#1821

#1824

#1826

#1828

#183

#1830

#1833

#1834

#1835

#1836

#1837

#1838

#1839

#184

#1842

#1843

#1844

#1845

#1846

#1847

#1848

#1849

#185

#1854

#1855

#1856

#1857

#186

#1864

#1866

#1867

#1868

#1869

#187

#1870

#1871

#1872

#1874

#1875

#188

#1880

#1881

#1882

#1883

#1884

#1885

#1886

#1887

#1888

#1889

#189

#1891

#1892

#1893

#1895

#1896

#1897

#1898

#1899

#19

#190

#1900

#1901

#1902

#1903

#1904

#1905

#1907

#1908

#1909

#1910

#1911

#1912

#1913

#1914

#1915

#1916

#1917

#1918

#1919

#192

#1920

#1921

#1922

#1923

#1924

#1925

#1926

#1927

#1928

#1929

#193

#1930

#1933

#1934

#194

#1940

#1942

#1943

#1944

#1945

#1946

#195

#1950

#1952

#1953

#1954

#1955

#1957

#196

#1960

#1961

#1964

#1965

#197

#1972

#1973

#198

#1982

#1984

#1985

#1989

#199

#1990

#1995

#1999

#20

#200

#2003

#2006

#2007

#201

#2013

#2015

#2027

#2028

#2029

#203

#2031

#2032

#2033

#2034

#2035

#2038

#2039

#2041

#2042

#2043

#2049

#205

#2050

#2056

#2058

#2059

#2060

#2061

#2062

#2063

#2064

#2065

#2068

#2069

#2071

#2074

#2078

#2079

#208

#2080

#2081

#2085

#2086

#2087

#2088

#2089

#2091

#2093

#2094

#2095

#2098

#21

#210

#2101

#2103

#2104

#2106

#2107

#2109

#211

#2110

#2115

#2116

#2117

#212

#2121

#2125

#2126

#213

#2131

#2133

#2137

#2140

#2147

#2149

#2151

#2152

#2154

#2156

#2157

#216

#2161

#2163

#2165

#2166

#2167

#2168

#217

#2170

#2172

#2174

#2176

#2177

#2179

#218

#2180

#2181

#2183

#2185

#2187

#2188

#2189

#219

#2192

#2195

#2196

#22

#220

#2202

#2204

#2206

#2207

#2208

#2213

#2216

#2218

#2219

#2226

#2229

#2230

#2231

#2235

#2236

#2238

#2240

#2241

#2245

#2246

#2247

#2249

#225

#2250

#2251

#2256

#2257

#2258

#2259

#2261

#2262

#2263

#2264

#2265

#2266

#2267

#2268

#2270

#2277

#2278

#2279

#228

#2280

#2281

#2282

#2285

#2286

#2287

#2289

#229

#2293

#2294

#2295

#2296

#2297

#2298

#23

#230

#2300

#2301

#2302

#2303

#2305

#2306

#2307

#2308

#2309

#231

#2310

#2314

#2319

#2322

#2323

#2324

#2327

#233

#2332

#2333

#2334

#2336

#2338

#2339

#234

#2340

#2342

#2347

#235

#2350

#2351

#2352

#2353

#2354

#2355

#236

#2366

#2367

#2369

#2372

#2373

#239

#241

#242

#244

#246

#247

#249

#25

#253

#256

#257

#259

#26

#263

#269

#27

#270

#273

#276

#279

#284

#286

#287

#289

#29

#290

#296

#297

#298

#30

#300

#304

#306

#31

#314

#315

#317

#32

#320

#321

#323

#327

#329

#33

#330

#331

#332

#334

#337

#339

#34

#341

#342

#345

#346

#35

#353

#354

#355

#356

#357

#359

#36

#360

#361

#363

#365

#366

#368

#369

#37

#371

#373

#374

#375

#376

#38

#381

#39

#390

#391

#392

#394

#396

#398

#399

#40

#400

#403

#405

#406

#41

#410

#411

#412

#422

#423

#430

#431

#432

#433

#434

#436

#438

#440

#442

#443

#444

#446

#447

#448

#449

#450

#451

#456

#457

#458

#464

#465

#466

#467

#469

#470

#472

#473

#474

#477

#479

#480

#481

#484

#488

#489

#491

#492

#494

#496

#498

#499

#500

#501

#502

#503

#506

#507

#509

#510

#513

#516

#518

#521

#522

#523

#524

#531

#532

#534

#535

#536

#537

#540

#542

#544

#545

#546

#547

#548

#549

#550

#551

#553

#555

#556

#558

#561

#564

#565

#566

#567

#568

#569

#570

#572

#575

#576

#577

#578

#579

#580

#581

#584

#585

#586

#588

#590

#593

#597

#599

#600

#601

#603

#606

#612

#615

#617

#619

#622

#623

#624

#626

#627

#628

#632

#633

#634

#635

#636

#637

#638

#639

#640

#641

#644

#645

#646

#647

#649

#652

#657

#658

#660

#661

#662

#668

#669

#671

#672

#675

#676

#679

#680

#681

#682

#685

#686

#687

#688

#689

#692

#694

#695

#696

#697

#698

#700

#701

#702

#703

#704

#705

#706

#708

#709

#710

#711

#712

#713

#714

#715

#716

#720

#722

#723

#724

#727

#728

#733

#734

#736

#738

#739

#740

#743

#745

#746

#748

#750

#752

#754

#755

#756

#758

#760

#762

#764

#766

#767

#768

#769

#772

#773

#776

#778

#779

#781

#782

#784

#785

#786

#787

#788

#790

#791

#793

#794

#797

#799

#802

#803

#804

#805

#808

#81

#810

#812

#813

#814

#815

#816

#819

#82

#821

#822

#823

#825

#826

#827

#829

#830

#831

#832

#833

#834

#836

#837

#838

#839

#84

#840

#841

#842

#843

#844

#845

#846

#847

#848

#85

#850

#852

#853

#854

#855

#856

#858

#859

#86

#861

#862

#863

#864

#865

#866

#867

#868

#869

#875

#877

#878

#879

#88

#881

#882

#884

#885

#886

#890

#895

#896

#897

#898

#899

#900

#902

#903

#904

#907

#908

#909

#91

#910

#912

#914

#915

#916

#917

#918

#92

#920

#921

#922

#923

#924

#925

#926

#927

#928

#929

#93

#930

#931

#932

#934

#936

#938

#94

#940

#95

#958

#96

#967

#968

#97

#971

#972

#974

#99

0794b946e0 Update to last Uno to fix "Collection was modified" problem on wasm Carl de Billy 2019-05-28 00:30:09 -04:00
89ca9f00c0 Restore android signing Jérôme Laban 2019-05-28 00:09:00 -04:00
e3b9aca5da

Merge pull request #78 from nventive/dev/dr/ProgCalc David 2019-05-27 23:30:27 -04:00
025eda9889 Fixed display of history Carl de Billy 2019-05-27 23:27:17 -04:00
c77a60420f Fix memory Carl de Billy 2019-05-27 23:27:06 -04:00
9069674809 Add support for the programmer calculator Dr.Rx 2019-05-27 22:56:48 -04:00
21c229429d

Merge pull request #77 from nventive/dev/madi/fix-landscape-mode-ios-2 MaximeDionNventiveCom 2019-05-27 21:18:22 -04:00
cc24398dbf

Merge pull request #74 from nventive/dev/dr/Keyboard David 2019-05-27 21:15:41 -04:00
ed6bcab248

Merge pull request #76 from nventive/dev/djo/update-uno-package David Oliver 2019-05-27 20:50:24 -04:00
ca45a2ee61 Add keyboard support Dr.Rx 2019-05-27 16:00:13 -04:00
869719ede5 154672 [Calculator] Landscape mode is broken Maxime Dion 2019-05-27 20:43:00 -04:00
8b449d6a15

Merge pull request #73 from nventive/dev/yogu/currency.fix.missing.issues Yohan Guérin 2019-05-27 20:37:20 -04:00
18193bab90 Update Uno David Oliver 2019-05-27 20:20:48 -04:00
52269e6d7f Add workaround for currency and ratio api calls in order to bypass CORS policy Yohan Guerin 2019-05-27 17:27:27 -04:00
ba179a4004 Add decimal button on NumPad for all platform Yohan Guerin 2019-05-27 17:24:43 -04:00
e9e86a559b

Merge pull request #75 from nventive/dev/madi/fix-landscape-mode-font-size MaximeDionNventiveCom 2019-05-27 16:49:56 -04:00
dc9477c7e4 154672 [Calculator] Landscape mode is broken Maxime Dion 2019-05-27 16:19:04 -04:00
98e7f0dc47

Merge pull request #69 from nventive/dev/cdb/history David 2019-05-27 16:05:55 -04:00
135500d6c7

Merge pull request #72 from nventive/dev/madi/xhange-app-name MaximeDionNventiveCom 2019-05-27 15:34:28 -04:00
45e6a7519a

Update src/Calculator.Shared/ViewModels/HistoryViewModel.cs Carl de Billy 2019-05-27 15:20:43 -04:00
b0ca230544 Change name to Uno Calc Maxime Dion 2019-05-27 15:01:00 -04:00
65998f9a52

Merge pull request #62 from nventive/dev/pako/hide-datecalc Papus Koulibaly 2019-05-27 14:46:05 -04:00
6f2e233109

Merge pull request #71 from nventive/dev/madi/fix-splashscreen-image-ios MaximeDionNventiveCom 2019-05-27 14:43:58 -04:00
a1747f758e

Merge pull request #70 from nventive/dev/djo/standard-xload David Oliver 2019-05-27 14:42:05 -04:00
d488f90112 Updated to latest Uno.UI Carl de Billy 2019-05-27 14:29:22 -04:00
3ebc83803e Fix splashscreen image @3x Maxime Dion 2019-05-27 14:18:59 -04:00
99c1af1ecd [Perf] Set x:Load=false for StandardOperators David Oliver 2019-05-27 14:05:21 -04:00
622a4a22c8

Merge pull request #66 from nventive/dev/madi/fix-combobox-drop-down-gliph MaximeDionNventiveCom 2019-05-27 13:37:36 -04:00
ec26223eaf

Merge pull request #67 from nventive/dev/nich/prog-bugs NicolasChampagne 2019-05-27 13:10:27 -04:00
24115abec9 Patch because ApplicationDataContainer is not implemented in Uno Carl de Billy 2019-05-27 12:31:46 -04:00
af575c24f8 Turn on the "xamlName" output in DOM Carl de Billy 2019-05-27 11:05:07 -04:00
e77ff0326e

Merge pull request #64 from nventive/dev/pako/menu-stays-open Papus Koulibaly 2019-05-27 12:52:13 -04:00
a1ad61900e

Merge pull request #65 from nventive/dev/djo/history-flyout David Oliver 2019-05-27 12:04:05 -04:00
a0cb4eb566 Fixed android margins, and prog numpad not displaying Nicolas Champagne 2019-05-27 11:55:08 -04:00
dbbd879090 Update to latest Uno David Oliver 2019-05-27 11:02:41 -04:00
2f9ce2660b Fix dropdown gliph on ios and android Maxime Dion 2019-05-27 11:22:28 -04:00
7224c10864

Merge pull request #63 from nventive/dev/madi/change-app-icon MaximeDionNventiveCom 2019-05-27 11:20:43 -04:00
e462ba43c4 Using InvariantCulture when converting toDouble to prevent format exception causing the Burger menu to stay open. Papus Koulibaly 2019-05-27 10:52:08 -04:00
8f3c4ecf9c Chaneg app icon on android Maxime Dion 2019-05-27 10:38:48 -04:00
7467460deb Remove AboutFlyout workaround David Oliver 2019-05-26 23:20:48 -04:00
a7839d2ffe Workaround ThemeDictionaries not supported David Oliver 2019-05-26 23:17:52 -04:00
425347f543 History flyout - comment out raise of never-subscribed event David Oliver 2019-05-26 07:21:21 -04:00
e364e17a57 Removed date calculator Papus Koulibaly 2019-05-27 10:06:35 -04:00
eb480e58a5

Merge pull request #61 from nventive/dev/jela/bundlename MaximeDionNventiveCom 2019-05-27 09:23:52 -04:00
03263c3a16

Restore Bundle name to Uno Calc Jérôme Laban 2019-05-27 08:45:45 -04:00
8c425ec42c

Merge pull request #58 from nventive/dev/madi/fix-background-color MaximeDionNventiveCom 2019-05-27 08:15:43 -04:00
84104af550

Merge pull request #60 from nventive/dev/dr/CurrencyUno David 2019-05-26 23:18:06 -04:00
ed477b782b Add support of Currency converter on Uno Dr.Rx 2019-05-26 10:14:32 -04:00
28c67c6abe

Merge pull request #59 from nventive/dev/dr/PerfCollections David 2019-05-26 10:49:35 -04:00
2477868b29 Improve perfe by batching collection change updates Dr.Rx 2019-05-26 10:13:18 -04:00
6843d212c3

Merge pull request #23 from nventive/dev/madi/fix-button-themeing MaximeDionNventiveCom 2019-05-26 08:18:58 -04:00
397c8a4071 Fix Background color for xamarin platforms Maxime Dion 2019-05-26 08:18:50 -04:00
be66b4c8e6 154034 [Calculator] Themeing of the button is not correct Maxime Dion 2019-05-22 16:00:39 -04:00
a9dfbeec4e

Merge pull request #51 from nventive/dev/madi/add-splashscreen-and-icon MaximeDionNventiveCom 2019-05-26 07:32:55 -04:00
f4d6fb9162

Merge pull request #57 from nventive/dev/dr/ResultScale David 2019-05-25 23:42:40 -04:00
b9d278853a Workaround text scaling in converters Dr.Rx 2019-05-25 23:17:08 -04:00
f9675074a2

Merge pull request #55 from nventive/dev/djo/seethrough-buttons David Oliver 2019-05-25 21:49:29 -04:00
336080169e

Merge pull request #56 from nventive/dev/dr/ResultScale David 2019-05-24 23:52:46 -04:00
b8f6afa080 Enable result text scalling when too long Dr.Rx 2019-05-24 23:22:46 -04:00
973ba9737f

Merge pull request #54 from nventive/dev/dr/DateCalc2 David 2019-05-24 22:12:32 -04:00
3583272064 Update Uno (Fix Calendar and WASM overlay burger menu) Dr.Rx 2019-05-24 21:11:22 -04:00
135a19e440 Fix Standard buttons showing through on other pages David Oliver 2019-05-24 21:23:50 -04:00
93f26159a3 Restore the Date calculator Dr.Rx 2019-05-24 18:28:40 -04:00
9285eb03a2

Merge pull request #42 from nventive/dev/jela/android-arch Jérôme Laban 2019-05-24 21:03:23 -04:00
c0787bfe7a Update exclusions Jérôme Laban 2019-05-24 20:40:07 -04:00
945e4873c5 remove unused ndk Jérôme Laban 2019-05-24 20:32:20 -04:00
6ec5d20fb2 Disable logging for wasm release, share logging for Uno Jérôme Laban 2019-05-24 20:30:46 -04:00
56851f7b8a Disable signing for non-CI builds Jérôme Laban 2019-05-24 20:30:25 -04:00
297df8b226 154463 [Calculator] SplashScreen + assets 154450 [Calculator] Correct app name and icon on iOS and Android Maxime Dion 2019-05-24 14:10:07 -04:00
48038bd194

Write line to context instead of console Pepe Rivera 2019-05-24 15:39:52 -07:00
e35a526aa8

Merge pull request #53 from nventive/dev/pako/pressure-missing-value Papus Koulibaly 2019-05-24 18:20:49 -04:00
c1e18c2ba6

Merge pull request #52 from nventive/dev/dr/Animations David 2019-05-24 17:23:01 -04:00
bceb9a2fde Removed uneeded spaces in localization key Papus Koulibaly 2019-05-24 17:22:17 -04:00
c350c867da

Merge pull request #46 from nventive/dev/gefi/font-size-converters David 2019-05-24 17:12:19 -04:00
c3f172b37d

Merge pull request #43 from nventive/dev/pako/about-flyout David 2019-05-24 17:11:44 -04:00
5561721675 Enable keypads entrance animations Dr.Rx 2019-05-24 17:00:14 -04:00
0d942ef6a6

Merge pull request #49 from nventive/dev/dr/ConvertersTrimming David 2019-05-24 17:01:42 -04:00
d9294ed9e6

Merge pull request #47 from nventive/dev/jeth/combobox MaximeDionNventiveCom 2019-05-24 16:59:43 -04:00
5bc5192bef Fix invalid 0 trimming in converters Dr.Rx 2019-05-24 16:21:34 -04:00
31e2e8e050 Changes the default theme resources to the light colors. Jeremie Thibeault 2019-05-24 16:12:19 -04:00
ecd8d298c4 Converters input/output font size is not valid Geoffrey Fielden-Briggs 2019-05-24 13:09:35 -04:00
3942706639

Merge pull request #45 from nventive/dev/yogu/implements.getlocalizedstring Yohan Guérin 2019-05-24 15:44:53 -04:00
28f561571b

Merge pull request #44 from nventive/dev/jeth/unit-backspace Jérémie Thibeault 2019-05-24 15:43:33 -04:00
a08c37d1be Add missing strtod_l Jérôme Laban 2019-05-24 15:24:00 -04:00
63de0d1d9f Integrated about flyout. Changed the AttachedFlyout by a ContextFlyout Papus Koulibaly 2019-05-24 14:44:00 -04:00
a64e9b482a Implements LocalizationStringUtil.GetLocalizedString Yohan Guerin 2019-05-24 14:58:19 -04:00
bf57ea9c84 Replaces invalid backspace character with the one used everywhere else. It's not part of the font. Jeremie Thibeault 2019-05-24 14:57:21 -04:00
361503e4ef Use android NDK r19c Jérôme Laban 2019-05-24 14:41:47 -04:00
9bf438baf3

Merge pull request #41 from nventive/dev/dr/PorgCalc David 2019-05-24 14:48:03 -04:00
53c8196d88

Merge pull request #39 from nventive/dev/jela/font-wasm Jérôme Laban 2019-05-24 14:43:55 -04:00
cff29ba285 Fix Programmer calc not loading Dr.Rx 2019-05-24 13:55:22 -04:00
adb7e06e78 Update Wasm bootstrapper, add defaut Jérôme Laban 2019-05-24 14:08:14 -04:00
aa38e7c4c0

Merge pull request #40 from nventive/dev/jela/android-arch Jérôme Laban 2019-05-24 14:06:19 -04:00
2fd8dc1f9d

Update localized strings 2019-05-24 (#521) Matt Cooley 2019-05-24 10:41:42 -07:00
741d065ced Update localized strings 2019-05-24 Matt Cooley 2019-05-24 10:19:31 -07:00
b96eac04a6 Adjust release android build, add GC config Jérôme Laban 2019-05-24 13:18:05 -04:00
843d7d4111

Merge pull request #38 from nventive/dev/dr/ConvertersOutput David 2019-05-24 13:17:29 -04:00
6b59b615f6

Merge pull request #35 from nventive/dev/dr/SuggestedResultNoOverflow David 2019-05-24 13:17:22 -04:00
d6248ecd8a Adjust wasm fonts and initial loading Jérôme Laban 2019-05-24 12:53:32 -04:00
4c769cb826

Merge pull request #37 from nventive/dev/jela/android-keystore Jérôme Laban 2019-05-24 12:47:05 -04:00