Merge branch 'release/plugin-sftp/v0.1.0-alpha'
Merge branch 'release/plugin-sftp/v0.1.3-alpha'
Merge branch 'release/plugin-sftp/v0.1.4-alpha'
Merge branch 'release/plugin-sftp/v0.1.6-alpha'
Merge branch 'release/plugin-sftp/v0.1.7-alpha'
Merge branch 'release/plugin-sftp/v0.1.8-alpha'
Bump version
Squashed 'core/' changes from 340e7ce..ae1b08d

ae1b08d Merge branch 'release/0.1.9-alpha'
4b2cc32 Userguide to changelog
c241f5e Update README.md
5a9cce6 Update README.md
39ba4cd Move syncany-assets to https://github.com/syncany/syncany-assets
af27968 Uncomment cleanup in tests
6a22c95 Add no-CLI-while-syncing tests
8b6b6e5 Fix bash completion generation on Travi
832191d Fix? the usual suspects by increasing the sleep times a bit
5d8430c You won't believe how I fixed this bug.
296264d Livin' on the edge.
d10e872 Wrong Arrays class
52101f7 Checksum checking when assembling files
c05c081 Update CHANGELOG.md
89076f0 Fixes issue #200
f48f947 Quick fix for issue #200
3a01307 Merge pull request #202 from syncany/bugfix/cleanup-time
c401715 Making cleanup time hold for entire operation
bc769fa Make bash completion awesome.
a74bdc7 Changelog update
e79981b Implement bash completion; relates to #201
181036d Add help text 'sy ls' to overview
81a4ce5 Add help text 'sy ls' to overview
8964344 Merge pull request #196 from syncany/feature/daemonauth
c168fd3 Add comments for #184 #196
a12bca3 Remove '*' logic from CLI HTTPS client; Add AllowAllHostnamesVerifier(); only connect to localhost; relates to #196 #184
aab1d9a Removing empty lines
7d4f8fc Reproduces issue #200
97b6b54 Merge branch 'develop' into feature/daemonauth
1a30096 Going wild with new lines
15b1e9f Add bind addr/port to daemon config; implement auto certificate regeneration on CN change; relates to #184 #196
7bdba7f Merge branch 'develop' into feature/daemonauth
c452952 Merge pull request #198 from syncany/bugfix/cleanup-when
a410b98 Small fixes on tests et al.
b4b1a46 Updating Cleanup usage with new options
e0bda79 New cleanup options tests
a4eadaf Merge branch 'develop' into feature/daemonauth
f698d3d Remove unused code
1da0e71 Alter reflections comment
0a10f85 Remove Reflections library in favor of Guava
ff5d798 Various style/small fixes
07a2eef Philipp dormiens nunquam titillandus. (newlines)
9183604 Enabling options in CLI
badb05d Adding time and number of db-file options to CleanupOptions
a740db9 Moving Port file and creating Cleanup file in state directory
1fb392f Update changelog
7d47d0c Remove BC 'ext' JAR (saves 2.9MB)
807adf4 Merge branch 'develop' into feature/daemonauth
607fc18 Merge branch 'develop' of github.com:syncany/syncany into develop
4845f69 Fixes wildcard-CN issue with CLI-to-API communication; daemonauth is now ready for merge; relates to #184
8b1834a Add self-signed ceritificate generation for keystore, add HTTPS only for API + web interface, almost have CLI-to-API working (HTTPS trust issue)
a47fc1d Move keystore to UserConfig
81bb916 Implement cache size parameter configurability
8275757 Revert "Use non-zero exit code on error"
2abf2fa Use non-zero exit code on error
0657939 Merge pull request #194 from syncany/bugfix/daemon-test
65f1deb Fixes LRU cache, fixes #169
e66bc4a Fix first of two tests dependant on number of database versions
f1c2388 Increasing time to allow settling and small altering cleanup
f980458 Bump PKGBUILD version
0ba5dac Bump version again; merge full cleanup, adjust changelog
a48d438 Merge branch 'develop' into bugfix/full-cleanup
d282c4f Merge branch 'release/0.1.8-alpha' into develop
2978c28 Fix command line test and CLI cleanup output to reflect new cleanup
edf841d Cleanup all databases to remove dirty references
2456885 Adjusting tests for full cleanup (all databaseversions are removed)
121fa8b disable filterFileVersion
abd4f4a Sorting list and fixing test
93f5b91 Removing MIN_KEEP_DATABASE_VERSIONS
4680449 Switch cleanup operation to full
0a5141e Merge branch 'feature/daemonauth' of github.com:syncany/syncany into feature/daemonauth
2fafb1f Merge develop into auth branch
e163386 Merge branch 'feature/daemonauth' of github.com:syncany/syncany into feature/daemonauth
7586cdd Merge branch 'feature/daemon' into feature/daemonauth
4165ecf Merge branch 'feature/daemon' into feature/daemonauth
ed6b1ee Merge branch 'develop' into feature/daemonauth
ffa3f66 Merge branch 'feature/daemonauth' of github.com:syncany/syncany into feature/daemonauth
f2b63fe Formatting
c370fac Merge branch 'feature/daemon' into feature/daemonauth
a87ec4a Merge branch 'develop' into feature/daemonauth
9bb3705 Merge branch 'develop' into feature/daemonauth
7449f4f HTTPS-only for web interface and API

git-subtree-dir: core
git-subtree-split: ae1b08d1a20e1a6e1d60a621ee1ed534153953b7
Merge commit 'dcbfb7355c803d22d57d1cd0d17959c28125f264'
Squashed 'core/' changes from e7c41bb..ed18574

ed18574 Merge branch 'release/0.1.10-alpha'
59ce06d Update changelog
f15a865 Adding bash completion to PKGBUILD
54781d5 Patching CLI tests to prevent littering daemon.xml

git-subtree-dir: core
git-subtree-split: ed1857427fa170a9db98ed7749148069482ac4ed
Merge commit '05d94e21ec5debab7a928156449b1e1ea9f653aa' into develop
Remove core
Squashed 'core/' content from commit ed18574

git-subtree-dir: core
git-subtree-split: ed1857427fa170a9db98ed7749148069482ac4ed
Merge commit 'a088db9cf2dd6aa707a2c3870b49dc9378c7e06d' as 'core'
Merge
Squashed 'core/' content from commit ed18574

git-subtree-dir: core
git-subtree-split: ed1857427fa170a9db98ed7749148069482ac4ed
Merge commit '22b903ac64aad5a38915b52fd9a9db8107974262' as 'core'
Fix version