Ghostkeeper
266e08fdff
Merge branch 'master' into ui_rework_4_0
...
Conflicts:
plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml - The compatibility chart being added in 3.6 which was kind of hacky.
resources/qml/SidebarHeader.qml - Removed in UI rework, edited on master.
2018-11-13 16:23:36 +01:00
..
2018-11-01 09:21:33 +01:00
2018-05-08 11:54:19 +02:00
2018-10-01 17:21:34 +02:00
2018-10-01 17:21:34 +02:00
2018-11-09 15:27:02 +01:00
2018-10-08 15:03:21 +02:00
2018-09-07 09:29:31 +02:00
2018-10-30 10:39:29 +01:00
2018-11-12 09:28:48 +01:00
2018-06-04 17:00:59 +02:00
2018-07-16 16:13:43 +02:00
2018-09-11 16:05:53 +02:00
2018-09-07 09:29:31 +02:00
2018-07-03 15:54:20 +02:00
2018-10-31 09:45:29 +01:00
2018-05-02 14:30:31 +02:00
2018-07-05 12:44:11 +02:00
2018-10-02 20:27:18 +02:00
2018-09-07 09:29:31 +02:00
2018-06-01 09:39:04 +02:00
2018-07-05 11:47:06 +02:00
2018-05-02 20:34:50 +02:00
2018-05-02 12:01:29 +02:00
2018-05-31 12:21:53 +02:00
2018-04-18 16:35:55 +02:00
2018-10-26 17:51:28 +02:00