mirror of
https://github.com/nextcloud/android.git
synced 2024-12-22 00:34:31 +03:00
b36914df88
Conflicts: AndroidManifest.xml src/com/owncloud/android/ui/activity/FileDisplayActivity.java src/com/owncloud/android/ui/fragment/FileDetailFragment.java |
||
---|---|---|
.. | ||
FileDownloadFragment.java | ||
PreviewImageActivity.java | ||
PreviewImageFragment.java | ||
PreviewImagePagerAdapter.java | ||
PreviewMediaFragment.java | ||
PreviewVideoActivity.java |