Commit 95d13537 authored by Robert Bradshaw's avatar Robert Bradshaw

Merge remote branch 'remotes/fransesc/compiler_directives'

Conflicts:
	docs/src/reference/compilation.rst
parents 19277ba5 c426cdcd
Markdown is supported
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