diff options
author | Daniel Albert <albert_daniel@t-online.de> | 2014-07-16 18:49:16 +0200 |
---|---|---|
committer | Daniel Albert <albert_daniel@t-online.de> | 2014-07-16 18:49:16 +0200 |
commit | d63534d6559f846b670f07bcc99fdd85ebe9cb3a (patch) | |
tree | 85d0135e80668347f5438ef4f85e134049491e8c /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java | |
parent | e375cde7e1a09df33c65a44ba57f3f75f2f98b15 (diff) | |
parent | 82af9672fdc7f548eb801c29d123c824ea286cdc (diff) | |
download | open-keychain-d63534d6559f846b670f07bcc99fdd85ebe9cb3a.tar.gz open-keychain-d63534d6559f846b670f07bcc99fdd85ebe9cb3a.tar.bz2 open-keychain-d63534d6559f846b670f07bcc99fdd85ebe9cb3a.zip |
Merge remote-tracking branch 'upstream/master'
Conflicts:
OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java index 86bc3fa5b..33ab52bca 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java @@ -69,6 +69,7 @@ public final class Constants { public static final String KEY_SERVERS = "keyServers"; public static final String KEY_SERVERS_DEFAULT_VERSION = "keyServersDefaultVersion"; public static final String CONCEAL_PGP_APPLICATION = "concealPgpApplication"; + public static final String FIRST_TIME = "firstTime"; } public static final class Defaults { |