Ghostkeeper 1d7792861d
Merge branch '3.0'
Conflict in ClusterControlItem.qml where there was a new element in Master that wasn't present in 3.0. That element wasn't referenced anywhere else so I just removed it.
2017-10-02 17:40:24 +02:00
..
2017-08-25 09:17:55 +02:00
2017-08-25 09:22:07 +02:00
2017-08-22 13:05:03 +02:00
2017-08-25 09:17:55 +02:00
2017-08-25 09:17:55 +02:00
2017-09-12 15:37:49 +02:00