Merge branch 'develop' into pinEnhancement
authorDavid A. Velasco <dvelasco@solidgear.es>
Tue, 5 May 2015 11:43:01 +0000 (13:43 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Tue, 5 May 2015 11:43:01 +0000 (13:43 +0200)
commitdcd8dde86400e2d36a25141b3ce3dfdb49965033
treec0c400828cbc291afeedd0c57198cbafcf6064e2
parentc04d9c21986e6ea093a7f60f08aae81cabdec262
parent3b08f9f5af5c4eb17c838cdfd5ef74be908a395a
Merge branch 'develop' into pinEnhancement
src/com/owncloud/android/ui/activity/FileActivity.java