Skip to content
Commit b81de1d5 authored by masensio's avatar masensio
Browse files

Merge branch 'master' into create_folder_button_on_action_bar_for_uploader 

Conflicts:
	res/layout/uploader_layout.xml
parents eda6f714 b572e4b9
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment