Merge branch 'master' of https://github.com/owncloud/android into material_buttons
authorAndy Scherzinger <info@andy-scherzinger.de>
Fri, 6 Nov 2015 10:38:51 +0000 (11:38 +0100)
committerAndy Scherzinger <info@andy-scherzinger.de>
Fri, 6 Nov 2015 10:38:51 +0000 (11:38 +0100)
commitc31f602fd19cac136032a3e02852f62be21aa489
tree9defabbfb77d18fcdafd58675e718fca22f278be
parentf7fe0e00de5749ac2f755184bd168b3c3540a06b
parent19cce9c90f503caf038783d1a4dbc2f786ccd93d
Merge branch 'master' of https://github.com/owncloud/android into material_buttons

Conflicts:
res/layout/list_item.xml
res/layout/list_item.xml
res/layout/ssl_untrusted_cert_layout.xml
res/values/styles.xml
src/com/owncloud/android/ui/activity/FileActivity.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java