Sebastian Thiel c6d67daa81 fix(conflict): use latest gen/ from origin/master ...

that fixes a conflict when merging

2017-05-22 20:48:47 +02:00

..

cmn.rs

chore(gen): regen all apis/clis for v1.0.4

2017-02-04 13:48:45 +01:00

main.rs

fix(conflict): use latest gen/ from origin/master

2017-05-22 20:48:47 +02:00