diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-04-24 14:18:01 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-04-24 14:18:01 +0200 |
| commit | b4aec3114d9911cf9aef0d14ee697e5131b2853f (patch) | |
| tree | 7237de5955ec34d8849737b2f9229bfbb37d0c45 /README.md | |
| parent | c2163460971cc01e65d7dfd18eec491f01ebc744 (diff) | |
| parent | baac30508d24dcda6135bf8ae338c99d8c3b8ad8 (diff) | |
| download | open-keychain-b4aec3114d9911cf9aef0d14ee697e5131b2853f.tar.gz open-keychain-b4aec3114d9911cf9aef0d14ee697e5131b2853f.tar.bz2 open-keychain-b4aec3114d9911cf9aef0d14ee697e5131b2853f.zip | |
Merge branch 'development' into linked-identities
Conflicts:
Graphics/update-drawables.sh
OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java
OpenKeychain/build.gradle
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -22,7 +22,7 @@ Translations are managed at Transifex, please contribute there at https://www.tr ### Contribute Code 1. Join the development mailinglist at http://groups.google.com/d/forum/openpgp-keychain-dev -2. Lookout for interesting issues on our issue page at Github: https://github.com/open-keychain/open-keychain/issues +2. Lookout for interesting issues on Github. We have tagged issues were we explicitly like to see contributions: https://github.com/open-keychain/open-keychain/labels/help-wanted 3. Tell us about your plans on the mailinglist 4. Read this README, especially the notes about coding style 5. Fork OpenKeychain and contribute code (the best part ;) ) |