Merge branch 'new_filetype_icons' of https://github.com/owncloud/android into materia...
authorAndy Scherzinger <info@andy-scherzinger.de>
Tue, 15 Sep 2015 16:44:49 +0000 (18:44 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Tue, 15 Sep 2015 16:44:49 +0000 (18:44 +0200)
commit9e15d2459d4280666e2fbc99d67326f680bf392b
tree1f15dc90ce8ad9dc88dc3bdfe916f260f23dbdad
parent6f5cb9aacabe0ecf078717b876ef743f1e8f5f74
parenteaf249803cbecf9f593bc54fc4ac9ad3e4eb4724
Merge branch 'new_filetype_icons' of https://github.com/owncloud/android into material_buttons