Commit 0be0c73d authored by Fang Yuedong's avatar Fang Yuedong
Browse files

Merge branch 'master' into 'release_v3.0' 

hot fix to include catalog as a module

See merge request !40
parents 9aa65324 b46181f5
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment