Grégoire Henry 11ad8fa8ea Fix rebase conflict. ... oups...		2018-04-17 15:24:23 +02:00
..
bin_baker	Jbuilder: update to beta.19.1	2018-04-06 11:47:22 +02:00
lib_baking	Genesis: add mnemonics, passwords and emails to genesis info generation	2018-04-17 10:36:46 +02:00
lib_client	Client: add a claim operation that activate a commitment account	2018-04-17 10:50:23 +02:00
lib_client_commands	Client: add a claim operation that activate a commitment account	2018-04-17 10:50:23 +02:00
lib_protocol	Fix rebase conflict.	2018-04-17 15:24:23 +02:00