Merge pull request #345 from owncloud/fix_pincode_in_instant_uploads
[pub/Android/ownCloud.git] / src / com / owncloud / android / operations / SynchronizeFileOperation.java
2012-10-27 Bartek PrzybylskiSolving modified date and length conflicts