Commit Graph

6 Commits

Author SHA1 Message Date
Wim Nap
5c264bd448 changed rabbitmq host 2018-05-01 14:24:30 +02:00
Egon Rijpkema
f7c3d56cbf added merlin builds 2018-04-24 09:53:30 +02:00
Egon Rijpkema
94113b8c25 Trying to adhere to python naming convention. 2018-04-23 15:55:16 +02:00
Egon Rijpkema
90a67e531d Docker in name is no longer needed 2018-04-23 15:35:37 +02:00
Egon Rijpkema
791595dcdf All changes in the merlin branches. 2018-04-23 15:07:18 +02:00
Egon Rijpkema
b6c6533824 First commit
(Contains all the master branches of the previous repositories)
2018-04-23 14:57:26 +02:00