mirror of
https://github.com/nextcloud/android.git
synced 2024-11-23 21:55:48 +03:00
d4e0f3bdb1
Conflicts: owncloud-android-library res/layout/list_fragment.xml res/values-fr/strings.xml src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java src/com/owncloud/android/ui/adapter/FileListListAdapter.java src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java src/com/owncloud/android/ui/fragment/ExtendedListFragment.java src/com/owncloud/android/ui/fragment/LocalFileListFragment.java src/com/owncloud/android/ui/fragment/OCFileListFragment.java |
||
---|---|---|
.. | ||
gradle-wrapper.jar | ||
gradle-wrapper.properties |