Merge branch 'develop' into refresh_folder_contents_when_browsed_into
authormasensio <masensio@solidgear.es>
Tue, 24 Sep 2013 12:57:45 +0000 (14:57 +0200)
committermasensio <masensio@solidgear.es>
Tue, 24 Sep 2013 12:57:45 +0000 (14:57 +0200)
commitfdf2cae2cee2f2d7e05f923da700a6d61471a081
treec7ce6c3e805a7952471d487f609b73473b0e3cee
parentc77919b96c88830c8968e3b534e45747a153434a
parent292870c3005c4332e8d04cfd8ed9f2edd4b1cfab
Merge branch 'develop' into refresh_folder_contents_when_browsed_into
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java