Skip to content
GitLab
Commit 354a00a8 authored by ocaisa's avatar ocaisa Committed by GitHub
Browse files

Merge pull request #23 from boegel/20161116145538_new_pr_CP2K41 

sync with develop & fix conflict
parents 90f2128e dd6bca66
Hide whitespace changes
Inline Side-by-side
Supports Markdown
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