Merge branch 'master' of github.com:conorpp/u2f-one-internal

kopia lustrzana https://github.com/solokeys/solo1
2018-06-27 21:41:02 -04:00 · 2018-06-27 21:41:02 -04:00 · 075ae80365
commit 075ae80365
--- a/.gitmodules
+++ b/.gitmodules
@ -9,4 +9,4 @@
 	url = https://github.com/kmackay/micro-ecc.git
 [submodule "crypto/tiny-AES-c"]
 	path = crypto/tiny-AES-c
-	url = https://github.com/kokke/tiny-AES-c.git
+	url = https://github.com/kokke/tiny-AES-c
--- a/crypto/tiny-AES-c
+++ b/crypto/tiny-AES-c
@ -0,0 +1 @@
+Subproject commit 4b97e75fb96c08f026d545f7f8905b5daa14e9e8
				`@ -0,0 +1 @@`
				`Subproject commit 4b97e75fb96c08f026d545f7f8905b5daa14e9e8`