Steffen Vogel 5d0ba771c6 Merge branch 'node-test' into develop ... # Conflicts: # include/villas/api/session.h # lib/api.c # lib/super_node.c # lib/web.c		2017-08-27 18:44:03 +02:00
..
actions	Merge branch 'node-test' into develop	2017-08-27 18:44:03 +02:00
Makefile.inc	replaced libconfig by jansson for parsing the configuration (huge commit)	2017-08-03 00:19:27 +02:00
session.c	Merge branch 'node-test' into develop	2017-08-27 18:44:03 +02:00