Merge branch 'beta' of https://github.com/owncloud/android into beta
authorAndy Scherzinger <info@andy-scherzinger.de>
Wed, 4 Nov 2015 09:11:39 +0000 (10:11 +0100)
committerAndy Scherzinger <info@andy-scherzinger.de>
Wed, 4 Nov 2015 09:11:39 +0000 (10:11 +0100)
commit570130ece72b228899ab2e5a708b656dc615e94d
treeaf699c7f8d6dc8cbda1e3299ca76e01478dcabb3
parent4d33ecf15e9a4fa22e1e49e563793704c7598a3f
parentf15c2f32ceea2f2e6abff36f828a37196db3040a
Merge branch 'beta' of https://github.com/owncloud/android into beta