diff options
| author | Tomás Touceda <chiiph@leap.se> | 2014-06-27 12:11:28 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-06-27 12:11:28 -0300 |
| commit | 2628bbf4c5faff50491cdd227c787ca7f148f368 (patch) | |
| tree | c720980423ef4e02e0461ff81f173d4396ecce51 /server/changes/feature_5571_allow-for-interrupting-and-recovering-sync | |
| parent | 0e7554add298ca582248ebfe8bc6e548568ebee5 (diff) | |
| parent | 03b4ed07d1c55770d9c5b0ed8e7d42dd08f80272 (diff) | |
Merge branch 'master' into develop
Diffstat (limited to 'server/changes/feature_5571_allow-for-interrupting-and-recovering-sync')
| -rw-r--r-- | server/changes/feature_5571_allow-for-interrupting-and-recovering-sync | 1 |
1 files changed, 0 insertions, 1 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). |