Commit Graph

5 Commits

Author SHA1 Message Date
Egon Rijpkema 2de343d22d Trying to adhere to python naming convention. 2018-04-23 15:54:54 +02:00
Egon Rijpkema 536df0decc Docker in name is no longer needed 2018-04-23 15:35:21 +02:00
Egon Rijpkema e2c62e15f0 Changes for a federated dashboard. 2018-04-23 15:13:29 +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