Skip to content
Unverified Commit 8fd2ab78 authored by Axel Kohlmeyer's avatar Axel Kohlmeyer
Browse files

Merge branch 'master' into nwchem

# Conflicts:
#	doc/src/Howto_client_server.rst
#	doc/src/server_md.txt
parents bc3807aa 947827fe
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment