Merge branch 'develop' into accessibility
authormasensio <masensio@solidgear.es>
Tue, 10 Mar 2015 13:58:21 +0000 (14:58 +0100)
committermasensio <masensio@solidgear.es>
Tue, 10 Mar 2015 13:58:21 +0000 (14:58 +0100)
commitc963eb0fad38ec71f511de231bd81deadecc70fb
tree6004a073fa256e48c461c26465139297ecde275e
parent21c775585804213116e490395df6b76561546d4e
parent5f3175229a3baf081ce5677f748d758bcb3676ac
Merge branch 'develop' into accessibility

Conflicts:
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
res/layout-land/account_setup.xml
res/layout/account_setup.xml
res/menu/main_menu.xml
res/values/strings.xml
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/activity/Preferences.java
src/com/owncloud/android/ui/adapter/FileListListAdapter.java