2
0
mirror of https://github.com/deajan/osync synced 2024-11-15 12:12:56 +00:00
Commit Graph

4 Commits

Author SHA1 Message Date
deajan
757c53ca3a Merge branch 'master' into betterKillChilds
Conflicts:
	dev/debug_osync.sh
	dev/n_osync.sh
	osync.sh
2016-04-01 21:24:53 +02:00
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
deajan
17c8bab444 Updated shunit2 to 2.1.7pre 2015-07-02 17:46:41 +02:00
onovy
13c9b02add Unit tests. 2015-04-21 12:21:33 +02:00