Merge pull request #752 from owncloud/instant_uploads_set_path
authorDavid A. Velasco <dvelasco@owncloud.com>
Wed, 26 Nov 2014 12:10:04 +0000 (13:10 +0100)
committerDavid A. Velasco <dvelasco@owncloud.com>
Wed, 26 Nov 2014 12:10:04 +0000 (13:10 +0100)
Better UI for settings path of instant uploads

1  2 
AndroidManifest.xml

Simple merge