4 commits

Author	SHA1	Message	Date
Dessalines	d932acad16	Merge branch 'federation' into dev_1	2020-02-05 12:51:03 -05:00
Felix	eaf548b5db	Merge branch 'master' into federation	2020-01-14 16:30:54 +01:00
Felix Ableitner	e09a035373	Merge branch 'master' into federation	2020-01-02 19:22:23 +01:00
Felix Ableitner	80f76f2efd	Use actix config to handle routes in seperate folders (#378)	2019-12-31 14:17:24 +01:00