4 Commits

Author	SHA1	Message	Date
Erik Pique	ce2724af69	resolve conflicts	2019-02-06 10:35:02 +01:00
Erik Pique	416ca43cea	fix variables linux	2019-01-31 15:02:55 +01:00
Erik Pique	be0b868d3b	add variables for new api sf	2019-01-07 10:16:30 +01:00
Erik Pique	121c62e500	add api configuration ocelot linux	2018-12-17 14:31:19 +01:00