summaryrefslogtreecommitdiff
path: root/server
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2014-06-06 14:10:24 -0300
committerTomás Touceda <chiiph@leap.se>2014-06-06 14:10:24 -0300
commit4dc1cd8662a34893051d2f520b73a0bd0774215c (patch)
tree1c57c8e0076e5be7b2d34ca085a4a04a0e681c4f /server
parentee53e05fbff3509a7cdb9bc510c891922f9a8bca (diff)
Fold in changes
Diffstat (limited to 'server')
-rw-r--r--server/changes/feature_5571_allow-for-interrupting-and-recovering-sync1
-rw-r--r--server/changes/feature_5571_split-sync-post1
2 files changed, 0 insertions, 2 deletions
diff --git a/server/changes/feature_5571_allow-for-interrupting-and-recovering-sync b/server/changes/feature_5571_allow-for-interrupting-and-recovering-sync
deleted file mode 100644
index 0087c535..00000000
--- a/server/changes/feature_5571_allow-for-interrupting-and-recovering-sync
+++ /dev/null
@@ -1 +0,0 @@
- o Allow for interrupting and recovering sync (#5517).
diff --git a/server/changes/feature_5571_split-sync-post b/server/changes/feature_5571_split-sync-post
deleted file mode 100644
index ad269cd4..00000000
--- a/server/changes/feature_5571_split-sync-post
+++ /dev/null
@@ -1 +0,0 @@
- o Split sync in multiple POST requests in server (#5571).