From: Andy Scherzinger Date: Fri, 9 Oct 2015 12:45:32 +0000 (+0200) Subject: Merge branch 'master' of https://github.com/owncloud/android into notification_coloring X-Git-Tag: oc-android-1.9^2~44^2~4 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/5db8c47b8a96161aa00912786e61817be6381c63?ds=inline;hp=--cc Merge branch 'master' of https://github.com/owncloud/android into notification_coloring --- 5db8c47b8a96161aa00912786e61817be6381c63