diff options
| author | Micah Anderson <micah@riseup.net> | 2013-08-27 14:45:19 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-08-27 14:45:19 -0400 |
| commit | ce411ee35e22a4d17b953ce4f8d22c7b648857c7 (patch) | |
| tree | 078c282115974d0d4bbdeb97748c26948ae70fcd /changes/feature_3487-split-soledad-into-common-client-and-server | |
| parent | f82457d8b3533dfa71b452cf1881ff3393368dd9 (diff) | |
| parent | ca67759c55395c694af51b4ae619fce794b31a1f (diff) | |
Merge remote-tracking branch 'leapcode/debian' into debian
Conflicts:
debian/changelog
Diffstat (limited to 'changes/feature_3487-split-soledad-into-common-client-and-server')
| -rw-r--r-- | changes/feature_3487-split-soledad-into-common-client-and-server | 2 |
1 files changed, 0 insertions, 2 deletions
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. |