mirror of
https://github.com/nextcloud/android.git
synced 2024-11-23 21:55:48 +03:00
6970560d2f
Conflicts: src/com/owncloud/android/datamodel/OCFile.java src/com/owncloud/android/ui/adapter/FileListListAdapter.java src/com/owncloud/android/ui/fragment/OCFileListFragment.java |
||
---|---|---|
.. | ||
attrs.xml | ||
bools.xml | ||
colors.xml | ||
oauth2_configuration.xml | ||
setup.xml | ||
strings.xml | ||
styles.xml | ||
versioned_styles.xml |