mirror of
https://github.com/nextcloud/android.git
synced 2024-11-23 21:55:48 +03:00
fbc3d970c5
Conflicts: res/layout/list_fragment.xml res/values/strings.xml src/com/owncloud/android/ui/fragment/ExtendedListFragment.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 |