mirror of
https://github.com/nextcloud/android.git
synced 2024-11-27 09:39:25 +03:00
7d9fc6857e
Conflicts: res/menu/main_menu.xml src/com/owncloud/android/ui/activity/FileDisplayActivity.java src/com/owncloud/android/ui/adapter/FileListListAdapter.java |
||
---|---|---|
.. | ||
account_picker_long_click.xml | ||
file_actions_menu.xml | ||
main_menu.xml |