An error occurred while loading the file. Please try again.

Merge branch 'testing' into 'devel_varun' · 73489e78

# Conflicts:
#   views/DE/account/contact.pug
#   views/DE/account/home.pug
#   views/DE/account/profile.pug
#   views/DE/account/security.pug
#   views/DE/account/services.pug

73489e78