Commit graph

2 commits

Author SHA1 Message Date
akshayaurora
c121c1aa4e reorganize files and bring code inline with current master
Conflicts:
	lib/simple_config.py
2015-09-03 14:20:37 +02:00
qua-non
9938316400 merge dashboard back into ui 2015-09-03 14:18:37 +02:00