deajan 5147431abf Merge branch 'master' of https://github.com/jodysankey/osync into jodysankey-master ... Conflicts: sync.conf		2015-09-15 13:00:33 +02:00
..
conf	Unit tests.	2015-04-21 12:21:33 +02:00
shunit2	Updated shunit2 to 2.1.7pre	2015-07-02 17:46:41 +02:00
run.sh	Merge branch 'master' of https://github.com/jodysankey/osync into jodysankey-master	2015-09-15 13:00:33 +02:00