Merge pull request #3922 from RealRancor/backport_3916_2.0

Backport #3916 to 2.0 - thanks
This commit is contained in:
Klaas Freitag 2015-10-06 14:42:40 +02:00
commit f6631443a1

View file

@ -108,7 +108,7 @@ ownCloud Client 1.1 or later. Using an incompatible time stamp-based
synchronization mechanism can lead to data loss in rare cases, especially when synchronization mechanism can lead to data loss in rare cases, especially when
multiple clients are involved and one utilizes a non-synchronized NTP time. multiple clients are involved and one utilizes a non-synchronized NTP time.
.. _`NTP time synchronisation`: http://en.wikipedia.org/wiki/Network_Time_Protocol .. _`NTP time synchronization`: http://en.wikipedia.org/wiki/Network_Time_Protocol
.. _Etag: http://en.wikipedia.org/wiki/HTTP_ETag .. _Etag: http://en.wikipedia.org/wiki/HTTP_ETag
Comparison and Conflict Cases Comparison and Conflict Cases