Commit graph

2 commits

Author SHA1 Message Date
akshayaurora
33c89b47d8 revert dynamic loading of screens and fix qrscanning 2015-09-03 14:22:25 +02:00
akshayaurora
c121c1aa4e reorganize files and bring code inline with current master
Conflicts:
	lib/simple_config.py
2015-09-03 14:20:37 +02:00