Commit fcdd96d9 authored by Rosanny Sihombing's avatar Rosanny Sihombing
Browse files

Merge branch 'testing' into 'MLAB-576'

# Conflicts:
#   views/DE/project/pagesList.pug
#   views/DE/project/projectList.pug
parents f02a41c3 50427a49
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