From d72f936c9212cf9f7d83e6109417cea0f09cc1c6 Mon Sep 17 00:00:00 2001 From: Thiago Avelino Date: Wed, 1 Apr 2015 23:24:11 -0300 Subject: [PATCH] merge categories, not create conversation categories --- README.md | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index b59159f9..c05ed4b6 100644 --- a/README.md +++ b/README.md @@ -18,11 +18,13 @@ If you're not inclined to make PRs you can tweet me at ```@ripienaar``` ## Tools for teams & Collaboration + * http://appear.in/ - One click video conversations, for free * http://www.hall.com/ - Free for unlimited users with some feature limitations * https://www.flowdock.com/ - Chat and inbox, free for teams of 5 or less * https://slack.com - Free for unlimited users with some feature limitations * https://hipchat.com - Free for unlimited users with some feature limitations * https://gitter.im - "Chat, for GitHub". Free for public rooms. + * http://www.google.com/hangouts/ - One place for all your Conversations, for free (Need Google Account) * https://kato.im - Team Chat & Collaboration, free for unlimited users with some feature limitations ## Code Quality @@ -35,11 +37,6 @@ If you're not inclined to make PRs you can tweet me at ```@ripienaar``` * https://codecov.io/ - Code coverage tool (SaaS) free for 1 private project and no restrictions for publics repos * https://insight.sensiolabs.com/ _ Code Quality for PHP/Symfony projects, free for Open Source -## Conversations (Call) - - * http://appear.in/ - One click video conversations, for free - * http://www.google.com/hangouts/ - One place for all your Conversations, for free (Need Google Account) - ## CI / CD * https://codeship.com/ - 100 private builds / month, 5 private projects. Unlimited for Open Source