Albert Vaca 84bba9429f Merge branch 'master' into 1.x ... # Conflicts: # core/backends/lan/downloadjob.cpp # core/backends/lan/downloadjob.h # core/filetransferjob.cpp # core/filetransferjob.h # plugins/notifications/sendreplydialog.cpp # plugins/notifications/sendreplydialog.h # plugins/telephony/sendsmsdialog.cpp # plugins/telephony/sendsmsdialog.h		2017-09-03 22:05:54 +02:00
..
contents/ui	Only show notification title in plasmoid if different to app name	2017-08-22 18:18:34 +02:00
metadata.desktop	Make member variable names, & placement and * placement more coherent	2017-09-03 21:45:08 +02:00