Skip to content
Snippets Groups Projects
Commit 66da2ce0 authored by Bob Coecke's avatar Bob Coecke
Browse files

Merge branch 'master' of https://gitlab.cis.strath.ac.uk/kwb13215/quantera-2 

# Conflicts:
#	NEWPROPOSAL/FULLPROP.tex
#	NEWPROPOSAL/ganttchart.tex
parents 118bd8e6 52f50b1b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment