Merge branch 'master' of /Users/fatihustundag/Projects/rsync-time-backup with conflicts.

This commit is contained in:
Fatih Üstündağ
2015-09-26 01:11:05 +03:00
parent 91fb6ffee7
commit 5b22966589
+2 -1
View File
@@ -1 +1,2 @@
.idea
.idea
test.sh