From 1766ce0b1976703efbfd4084919f435358f668f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Me=C3=9Fmer?= Date: Sat, 17 Feb 2018 20:22:38 -0800 Subject: [PATCH 1/2] Have a CI button for Travis and Circle CI --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8e98acf6..7369a6e1 100644 --- a/README.md +++ b/README.md @@ -1,4 +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 From e673e5951954b1550d35b78540839a2fe1b62728 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Me=C3=9Fmer?= Date: Sat, 17 Feb 2018 20:23:35 -0800 Subject: [PATCH 2/2] Remove TODO --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 7369a6e1..b27087be 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,5 @@ # 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. See [https://www.cryfs.org](https://www.cryfs.org).