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