diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-02 18:34:51 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-02 18:34:51 +0100 |
| commit | e6af789bf50f9636d3455c4bd1b662ab5d04e3e2 (patch) | |
| tree | 35e7560cd785aa20c1fa814332d16bd094921282 /extern/html-textview | |
| parent | 5e53a5417c11f54f437d9f220d3e2e8579b8bf1b (diff) | |
| parent | 145e793db1d732bdd230be92750123cd20c9502d (diff) | |
| download | open-keychain-e6af789bf50f9636d3455c4bd1b662ab5d04e3e2.tar.gz open-keychain-e6af789bf50f9636d3455c4bd1b662ab5d04e3e2.tar.bz2 open-keychain-e6af789bf50f9636d3455c4bd1b662ab5d04e3e2.zip | |
Merge branch 'development' into linked-identities
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserAttributesAdapter.java
Diffstat (limited to 'extern/html-textview')
| m--------- | extern/html-textview | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/extern/html-textview b/extern/html-textview -Subproject eedaa334e761273efbfc49ded2124df58c8a4d8 +Subproject 9872a73156518fd8df79dd2cd4d24750574b9ac |