Merge branch 'next' of github.com:cryfs/cryfs into next

This commit is contained in:
Sebastian Messmer 2018-04-04 21:21:36 -07:00
commit 3047ec229d

View File

@ -1,6 +1,4 @@
# CryFS [![CircleCI](https://circleci.com/gh/cryfs/cryfs/tree/next.svg?style=svg)](https://circleci.com/gh/cryfs/cryfs/tree/next) # CryFS [![Build Status](https://travis-ci.org/cryfs/cryfs.svg?branch=master)](https://travis-ci.org/cryfs/cryfs) [![CircleCI](https://circleci.com/gh/cryfs/cryfs/tree/master.svg?style=svg)](https://circleci.com/gh/cryfs/cryfs/tree/master)
**TODO:** Update CI link to correct branch when merging next->develop or develop->master
CryFS encrypts your files, so you can safely store them anywhere. It works well together with cloud services like Dropbox, iCloud, OneDrive and others. CryFS encrypts your files, so you can safely store them anywhere. It works well together with cloud services like Dropbox, iCloud, OneDrive and others.
See [https://www.cryfs.org](https://www.cryfs.org). See [https://www.cryfs.org](https://www.cryfs.org).