Fixed 'keep both' action in conflicts dialog (both resulting file were linked to...
[pub/Android/ownCloud.git] / libs /
2012-04-28 Bartek Przybylskijackrabbit lib
2012-04-28 Bartek Przybylskiinitial move to jackrabbit (syncing)
2012-04-07 Bartek Przybylskifix of filedisplay for phones