projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ef034fd
b9c4fab
)
Merge remote-tracking branch 'origin/pinEnhancement' into pinEnhancement
author
David A. Velasco
<dvelasco@solidgear.es>
Tue, 5 May 2015 11:42:51 +0000
(13:42 +0200)
committer
David A. Velasco
<dvelasco@solidgear.es>
Tue, 5 May 2015 11:42:51 +0000
(13:42 +0200)
1
2
src/com/owncloud/android/ui/activity/PassCodeActivity.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/com/owncloud/android/ui/activity/PassCodeActivity.java
Simple merge
projects / pub / Android / ownCloud.git / commitdiff