Merge pull request #1219 from owncloud/sync_full_folder__fix_conflict_save_local_version
[pub/Android/ownCloud.git] / res / menu /
drwxr-xr-x   ..
-rw-r--r-- 987 account_picker_long_click.xml
-rw-r--r-- 3590 file_actions_menu.xml
-rw-r--r-- 2148 main_menu.xml