8.x 2.x

Removed the git conflict code from CSS file.

Merge request reports

Loading