Skip to content
Commit 5139cacb authored by Alberto Miranda's avatar Alberto Miranda ♨
Browse files

Merge branch 'master' of git.ph.ed.ac.uk:nextgenio/norns 

Conflicts:
	include/Makefile.am
parents 311b9eaa afcd33e2
Pipeline #76 passed with stages
in 34 minutes and 24 seconds