Skip to content

Commit

Permalink
Morpho in Oberthur's note + Idemia entry
Browse files Browse the repository at this point in the history
  • Loading branch information
maxxyme authored and martinpaljak committed Jan 21, 2020
1 parent 9b08a1a commit 9bf0d3d
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion docs/JavaCardBuyersGuide/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,11 @@ Known manufacturers of JavaCard compatible smart cards, in alphabetical order:
* [Feitian](http://www.ftsafe.com/)
* [Gemalto](http://www.gemalto.com/)
* [Giesecke & Devrient](http://www.gi-de.com/)
* [Idemia](http://www.idemia.com/) (merger of Oberthur + Morpho)
* [Infineon](http://www.infineon.com/)
* [Morpho](http://www.morpho.com/) (merged with Oberthur, now Idemia)
* [NXP (JCOP)](http://www.nxp.com/)
* [Oberthur](http://www.oberthur.com/) (merged with Oberthur, now Idemia)
* [Oberthur](http://www.oberthur.com/) (merged with Morpho, now Idemia)


## Shops that sell JavaCard-s
Expand Down

0 comments on commit 9bf0d3d

Please sign in to comment.