Explorar o código

Merge remote-tracking branch 'origin/view-binding' into view-binding

# Conflicts:
#	src/main/java/com/owncloud/android/ui/fragment/ShareFileFragment.java
Stefan Niedermann %!s(int64=4) %!d(string=hai) anos
pai
achega
a0bf78e7b4

Os datos das diferenzas Diff non están dispoñibles.