summaryrefslogtreecommitdiff
path: root/changes/feature_reintegrate_soledad
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2013-08-01 11:01:16 +0200
committerKali Kaneko <kali@leap.se>2013-08-01 11:01:16 +0200
commit8f3e7332e3fa0b7245eba878456f93a2e11ecbbf (patch)
treedd64e1c2d43b6c59b99a53a8938f769299adecfc /changes/feature_reintegrate_soledad
parentb39584175fda25d812dbb90d3fa171f7a50e3914 (diff)
parent6f11db8234a7236f6dce0c4611dffa3068dc5036 (diff)
Merge branch 'reintegrate-soledad' into develop
Diffstat (limited to 'changes/feature_reintegrate_soledad')
-rw-r--r--changes/feature_reintegrate_soledad1
1 files changed, 1 insertions, 0 deletions
diff --git a/changes/feature_reintegrate_soledad b/changes/feature_reintegrate_soledad
new file mode 100644
index 00000000..34913149
--- /dev/null
+++ b/changes/feature_reintegrate_soledad
@@ -0,0 +1 @@
+ o Reintegrate Soledad into the client. Closes #3307. \ No newline at end of file