diff options
| author | Kali Kaneko <kali@futeisha.org> | 2013-08-27 19:51:51 +0200 |
|---|---|---|
| committer | Kali Kaneko <kali@futeisha.org> | 2013-08-27 19:51:51 +0200 |
| commit | 53295c63dcee0a6a2824d18854326470b086545f (patch) | |
| tree | 6d6a0a7b585d61475417373798fe5440b139c9da /changes | |
| parent | 50b2cf99130f92d2ab4b12373116c6ca896f1a81 (diff) | |
| parent | c091267cb8191a8e23c352063113729cb7fb3cb1 (diff) | |
Merge branch 'master' into debian
Diffstat (limited to 'changes')
| -rw-r--r-- | changes/bug_signal_events | 2 | ||||
| -rw-r--r-- | changes/feature_3487-split-soledad-into-common-client-and-server | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/changes/bug_signal_events b/changes/bug_signal_events deleted file mode 100644 index 6149c56..0000000 --- a/changes/bug_signal_events +++ /dev/null @@ -1,2 +0,0 @@ - o Signal different key related events, like key generation, key - upload.
\ No newline at end of file diff --git a/changes/feature_3487-split-soledad-into-common-client-and-server b/changes/feature_3487-split-soledad-into-common-client-and-server deleted file mode 100644 index 4698323..0000000 --- a/changes/feature_3487-split-soledad-into-common-client-and-server +++ /dev/null @@ -1,2 +0,0 @@ - o Update to new soledad package scheme (common, client and server). Closes - #3487. |