Skip to content
Commit b27f4125 authored by Valentin Rusu's avatar Valentin Rusu
Browse files

Manually merging from frameworks 

For some reason, git merge skipped these so I'm manually merging them.
I'm not sure about the translations, though
parent 35f20ebe
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