Skip to content
Commit 4d83be1a authored by Aleix Pol Gonzalez's avatar Aleix Pol Gonzalez 🐧
Browse files

Merge branch 'Plasma/5.4' 

# Conflicts:
#	CMakeLists.txt
parents 5d86c610 456c5a03
Hide whitespace changes
Inline Side-by-side
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