diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-06 01:08:12 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-06 01:08:12 +0200 |
commit | 881a50207af0a9f9f5aa69f451110de786779b54 (patch) | |
tree | 776bf4363c3e8736c3678eba93017387fffd8463 /OpenKeychain/src/main/res/raw/help_about.html | |
parent | 0bfac9989f801aa93d8bc336307d60b817995688 (diff) | |
parent | 6ba7536838b8fbc69684bec7c3e847afcb5e9d6a (diff) | |
download | open-keychain-881a50207af0a9f9f5aa69f451110de786779b54.tar.gz open-keychain-881a50207af0a9f9f5aa69f451110de786779b54.tar.bz2 open-keychain-881a50207af0a9f9f5aa69f451110de786779b54.zip |
Merge branch 'master' into yubikey
Conflicts:
.gitmodules
OpenKeychain/build.gradle
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
extern/openpgp-api-lib
settings.gradle
Diffstat (limited to 'OpenKeychain/src/main/res/raw/help_about.html')
-rw-r--r-- | OpenKeychain/src/main/res/raw/help_about.html | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/OpenKeychain/src/main/res/raw/help_about.html b/OpenKeychain/src/main/res/raw/help_about.html index a9178d515..580ac5865 100644 --- a/OpenKeychain/src/main/res/raw/help_about.html +++ b/OpenKeychain/src/main/res/raw/help_about.html @@ -9,40 +9,41 @@ And don't add newlines before or after p tags because of transifex --> <p><a href="http://www.openkeychain.org">OpenKeychain</a> is an OpenPGP implementation for Android.</p> <p>License: GPLv3+</p> -<h2>Developers OpenKeychain</h2> +<h2>Developers</h2> <ul> -<li>Dominik Schürmann (Lead developer)</li> -<li>Ash Hughes (crypto patches)</li> +<li>Dominik Schürmann (Maintainer)</li> +<li>Art O Cathain</li> +<li>Ash Hughes</li> <li>Brian C. Barnes</li> -<li>Bahtiar 'kalkin' Gadimov (UI)</li> +<li>Bahtiar 'kalkin' Gadimov</li> +<li>Daniel Albert <li>Daniel Hammann</li> <li>Daniel Haß</li> <li>Greg Witczak</li> +<li>'mar-v-in'</li> +<li>Markus Doits</li> <li>Miroojin Bakshi</li> <li>Nikhil Peter Raj</li> <li>Paul Sarbinowski</li> +<li>'Senecaso'</li> <li>Sreeram Boyapati</li> -<li>Vincent Breitmoser</li> +<li>Thialfihar (APG 1.x)</li> <li>Tim Bray</li> -</ul> - -<h2>Developers APG 1.x</h2> -<ul> -<li>Thialfihar (Lead developer)</li> -<li>'Senecaso' (QRCode, sign key, upload key)</li> -<li>Markus Doits</li> +<li>Vincent Breitmoser</li> </ul> <h2>Libraries</h2> <ul> <li><a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v4</a> (Apache License v2)</li> <li><a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v7 'appcompat'</a> (Apache License v2)</li> +<li><a href="https://github.com/timbray/KeybaseLib">KeybaseLib</a> (Apache License v2)</li> +<li><a href="https://github.com/JohnPersano/SuperToasts">SuperToasts</a> (Apache License v2)</li> +<li><a href="https://github.com/splitwise/TokenAutoComplete">TokenAutoComplete</a> (Apache License v2)</li> +<li><a href="https://github.com/rtreffer/minidns">MiniDNS</a> (Apache License v2)</li> <li><a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (Apache License v2)</li> -<li><a href="https://github.com/Bearded-Hen/Android-Bootstrap">Android-Bootstrap</a> (MIT License)</li> <li><a href="http://code.google.com/p/zxing/">ZXing</a> (Apache License v2)</li> <li><a href="http://rtyley.github.com/spongycastle/">SpongyCastle</a> (MIT X11 License)</li> <li><a href="https://github.com/dschuermann/html-textview">HtmlTextView</a> (Apache License v2)</li> -<li><a href="https://github.com/johnkil/Android-AppMsg">Android AppMsg Library</a> (Apache License v2)</li> </ul> </body> </html> |