projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 79cb610)
Merge remote-tracking branch 'upstream/develop' into beautifyTimestamps
authortobiasKaminsky <tobias@kaminsky.me>
Wed, 12 Nov 2014 08:02:23 +0000 (09:02 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Wed, 12 Nov 2014 08:02:23 +0000 (09:02 +0100)
Conflicts:
src/com/owncloud/android/utils/DisplayUtils.java


No differences found
ownCloud Android App