Skip to content
Commit f5a5bce4 authored by Andreas Klöckner's avatar Andreas Klöckner
Browse files

Merge branch 'cahn-hilliard-2' into 'cahn-hilliard' 

Merge cahn-hilliard work into a single branch

See merge request !34
parents 5b6af6d6 0a249aa5