mirror of
https://github.com/nextcloud/android.git
synced 2024-12-22 08:44:34 +03:00
b36914df88
Conflicts: AndroidManifest.xml src/com/owncloud/android/ui/activity/FileDisplayActivity.java src/com/owncloud/android/ui/fragment/FileDetailFragment.java |
||
---|---|---|
.. | ||
owncloud/android |