Merge branch 'master' of https://github.com/owncloud/android into notification_coloring
authorAndy Scherzinger <info@andy-scherzinger.de>
Wed, 14 Oct 2015 08:34:48 +0000 (10:34 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Wed, 14 Oct 2015 08:34:48 +0000 (10:34 +0200)
commitc56b3568c527edb323a117eb135012a5d406590b
tree978263686679e59d86b627ca3df1420f158735e6
parent4b4c32381041fd7650bb49d52a35c1213719e8ed
parentc47b0ab77ac00c001eb649141c0c3a24587164ba
Merge branch 'master' of https://github.com/owncloud/android into notification_coloring