projects
/
pub
/
Android
/
ownCloud.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'remotes/upstream/bug_1251' into beta
[pub/Android/ownCloud.git]
/
src
/
com
/
owncloud
/
android
/
ui
/
activity
/
PassCodeActivity.java
diff --git
a/src/com/owncloud/android/ui/activity/PassCodeActivity.java
b/src/com/owncloud/android/ui/activity/PassCodeActivity.java
index
135fe04
..
d06306b
100644
(file)
--- a/
src/com/owncloud/android/ui/activity/PassCodeActivity.java
+++ b/
src/com/owncloud/android/ui/activity/PassCodeActivity.java
@@
-526,5
+526,4
@@
public class PassCodeActivity extends AppCompatActivity {
}
-
}