mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-11-23 10:51:16 -07:00
Conflicts: resources/qml/Actions.qml -> Translation fixes on master, while the QML elements were changed here for Controls2. |
||
|---|---|---|
| .. | ||
| images | ||
| qml | ||