Merge branch 'master' of https://github.com/owncloud/android into notification_coloring
authorAndy Scherzinger <info@andy-scherzinger.de>
Fri, 9 Oct 2015 12:45:32 +0000 (14:45 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Fri, 9 Oct 2015 12:45:32 +0000 (14:45 +0200)
commit5db8c47b8a96161aa00912786e61817be6381c63
tree1d1d6adeda02f024ca5f5982fe6e2f8b6d2b52a5
parent796b1bd297e171968d76a2a9c7f351540caa8861
parentf9b7cbd2d58d7216bbf4d7245a906444f843ef1e
Merge branch 'master' of https://github.com/owncloud/android into notification_coloring