4 Commits

Author	SHA1	Message	Date
fmtabbara	568862a571	fix conflicts + errors	2022-03-17 16:40:49 +00:00
fmtabbara	51bced8766	merge develop	2022-03-12 22:17:33 +00:00
Jon Häggblad	e24f8aa219	Fix rust 2018 idioms warnings (#1092) ... * Fix elided-lifetimes-in-paths warnings Enabling `-Wrust-2018-idioms` generates `-Welided-lifetimes-in-paths` warnings about hidden lifetime parameters in types being deprecated * Unused extern crate	2022-02-02 20:47:28 +01:00
AniaPiotrowska	ab7f24dc1f	Merge pull request #837 from nymtech/feature/vouchers ... Feature/vouchers	2021-11-22 19:34:58 +00:00