From 4a2d166575a40204158212e26a5dc137f62d67e7 Mon Sep 17 00:00:00 2001 From: Frank Bian Date: Thu, 14 May 2015 17:46:08 +0800 Subject: [PATCH 1/3] add the wunderlist under the Tools for team & Collaboration --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 41ca9f8e..d403be8e 100644 --- a/README.md +++ b/README.md @@ -74,6 +74,7 @@ Table of Contents * https://www.blockspring.com/ - Share scripts with anyone on your team: cross language and with spreadsheet users. Free for 5 million runs a month. * https://helpmonks.com/ - Shared inbox for teams - Free for open source projects and non-profit organizations. * http://typetalk.in/ - Share and discuss ideas with your team through instant messaging on the web or on your mobile. + * https://www.wunderlist.com/ - Share your lists and work collaboratively on projects with your colleagues - Available for free on iPhone,iPad,Mac,Android,Windows and the Web. ## Code Quality From c1ca5f1dc1ce9960ee9486273c5d731e840194e3 Mon Sep 17 00:00:00 2001 From: Frank Bian Date: Thu, 14 May 2015 20:07:18 +0800 Subject: [PATCH 2/3] update to rebase --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d403be8e..a872abb0 100644 --- a/README.md +++ b/README.md @@ -74,7 +74,7 @@ Table of Contents * https://www.blockspring.com/ - Share scripts with anyone on your team: cross language and with spreadsheet users. Free for 5 million runs a month. * https://helpmonks.com/ - Shared inbox for teams - Free for open source projects and non-profit organizations. * http://typetalk.in/ - Share and discuss ideas with your team through instant messaging on the web or on your mobile. - * https://www.wunderlist.com/ - Share your lists and work collaboratively on projects with your colleagues - Available for free on iPhone,iPad,Mac,Android,Windows and the Web. + * https://www.wunderlist.com/ - Share your lists and work collaboratively on projects with your colleagues - Available for free to download and use on iPhone,iPad,Mac,Android,Windows and the Web. ## Code Quality From 018efc71cfb0edcfe5a8979d75e8840af3b8df7d Mon Sep 17 00:00:00 2001 From: Frank Bian Date: Wed, 20 May 2015 11:16:51 +0800 Subject: [PATCH 3/3] update conficts for PR --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 387e816b..117b3889 100644 --- a/README.md +++ b/README.md @@ -76,7 +76,8 @@ Table of Contents * https://talky.io/ - Free group video chat. Anonymous. Peer‑to‑peer. No plugins, signup, or payment required. * http://sourcetalk.net/ - Code discussion tool, free for open code talks. * http://vipaar.com/ - Help over video with augmented reality. Free without analytics, encryption, support. - * https://evernote.com/ - Tool for organizing information. Share your notes and work together with others. + * https://evernote.com/ - Tool for organizing information. Share your notes and work together with others. + * https://www.wunderlist.com/ - Share your lists and work collaboratively on projects with your colleagues - Available for free to download and use on iPhone,iPad,Mac,Android,Windows and the Web. ## Code Quality