4 Commits

Author	SHA1	Message	Date
Albert Vaca	f5725b7c8d	Merge branch 'master' into ssl ... # Conflicts: # build.gradle # src/org/kde/kdeconnect/Backends/BaseLink.java # src/org/kde/kdeconnect/Backends/BaseLinkProvider.java # src/org/kde/kdeconnect/Backends/LanBackend/LanLink.java # src/org/kde/kdeconnect/Backends/LanBackend/LanLinkProvider.java # src/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackLink.java # src/org/kde/kdeconnect/BackgroundService.java # src/org/kde/kdeconnect/Device.java # src/org/kde/kdeconnect/Helpers/DeviceHelper.java # src/org/kde/kdeconnect/UserInterface/DeviceActivity.java # src/org/kde/kdeconnect/UserInterface/PairActivity.java # tests/org/kde/kdeconnect/LanLinkProviderTest.java # tests/org/kde/kdeconnect/LanLinkTest.java	2015-09-11 09:24:35 -07:00
Albert Vaca	52a61f5663	Fixed test	2015-09-10 15:49:50 -07:00
Vineet Garg	00557052ff	Corrected unit tests ... Settings were not save properly when certificate was null Removed LanLinkProvider test, impossible with new design	2015-06-21 17:30:29 +05:30
Vineet Garg	3e70c21031	Added LanLinkTest and LanLinkProviderTest	2015-06-13 12:36:22 +05:30