[simon/kf5] /: Merge remote-tracking branch 'origin/master' into kf5

Tue Apr 24 21:15:50 UTC 2018

Git commit 5f802fc42e377709ad7a0c84c1b61de97df8a310 by Luigi Toscano.
Committed on 24/04/2018 at 21:15.
Pushed by ltoscano into branch 'kf5'.

Merge remote-tracking branch 'origin/master' into kf5

M  +2    -2    afaras/src/org.kde.afaras.desktop
M  +5    -5    doc/simon/index.docbook
M  +1    -1    sscd/src/org.kde.sscd.desktop

https://commits.kde.org/simon/5f802fc42e377709ad7a0c84c1b61de97df8a310