Skip to content
Snippets Groups Projects
Commit 74d3c583 authored by Alok Singh's avatar Alok Singh
Browse files

Merge branch '2.0.x' into 'yg_corporate_lite-3419374'

# Conflicts:
#   css/style.css
parents bfa745f5 1b3eae1d
No related branches found
No related tags found
No related merge requests found
Pipeline #226207 passed