Merge remote-tracking branch 'origin/selective-sync-big-folder' into 2.3
authorMarkus Goetz <markus@woboq.com>
Wed, 25 Jan 2017 18:45:20 +0000 (19:45 +0100)
committerMarkus Goetz <markus@woboq.com>
Wed, 25 Jan 2017 18:45:20 +0000 (19:45 +0100)
commitc8cfb3160efffdcf16a22ec830fd2fc7ae14b070
tree4625f4ef3fe660c3b18f1ba1b519594eb6af9964
parent268fc97a714ad1be18e6727c2f0ca8d2b9b755df
parent0249a68420ba4e225caba416835fd6ec5500dd19
Merge remote-tracking branch 'origin/selective-sync-big-folder' into 2.3