-
Christoph Kempen authored
Merge branch 'master' of github.com:privacybydesign/irma-demo-schememanager into feature/suwinet_singleton # Conflicts: # index # index.sig # timestamp
abd5e290
Merge branch 'master' of github.com:privacybydesign/irma-demo-schememanager into feature/suwinet_singleton # Conflicts: # index # index.sig # timestamp