prieto 0b7271529c Merge branch 'master' of git.labocleo.org:lodel2 ... Conflicts: examples/em_test.pickle plugins/webui/run.py		2016-09-02 09:47:49 +02:00
..
conf.d	Modified conf.d/lodel.ini for handle new plugins configuration	2016-08-30 12:22:50 +02:00
loader.py	Deleted debug message	2016-08-19 16:24:18 +02:00
lodel_admin.py	Bugfixes in lodel_admin init_db action	2016-08-24 11:20:46 +02:00
Makefile	Merge branch 'master' of git.labocleo.org:lodel2	2016-09-02 09:47:49 +02:00