3 Commits

Author	SHA1	Message	Date
Vincent Bernardoff	b48187d43b	Client: fix .merlin file.	2017-03-16 18:49:31 +01:00
Benjamin Canou	23869991ca	Alpha: update .merlin.	2017-03-02 16:19:12 +01:00
Grégoire Henry	d5d5cc7c09	Proto: rename bootstrap into alpha	2017-02-25 18:14:05 +01:00