Merge branch 'main' into 'fmtandfix'

# Conflicts:
#   src/desfire/mod.rs
This commit is contained in:
Kai Kriegel 2022-05-05 11:52:13 +00:00
commit d6808b9dea

View File

@ -167,4 +167,4 @@ pub enum FileTypes {
mod apduinstructions; mod apduinstructions;
mod apdustatuscodes; mod apdustatuscodes;
pub mod desfire; pub mod desfire;
pub use desfire::Desfire; pub use crate::desfire::desfire::Desfire;