aboutsummaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorMichael VanOverbeek <[email protected]>2016-07-25 12:57:52 -0400
committerGitHub <[email protected]>2016-07-25 12:57:52 -0400
commit46c1c31302f111a1f3ec23a70e6f3986a9aa2a27 (patch)
treef00af7ea3f6ad2641fb26fa1d310fd8b7179b39c /README.md
parentaf48e774189596b8d7a058c564a7d6d75205ca03 (diff)
parent6fa16209519896de09949a27425dff00ebf2970a (diff)
downloadshiftos-c--46c1c31302f111a1f3ec23a70e6f3986a9aa2a27.tar.gz
shiftos-c--46c1c31302f111a1f3ec23a70e6f3986a9aa2a27.tar.bz2
shiftos-c--46c1c31302f111a1f3ec23a70e6f3986a9aa2a27.zip
Merge pull request #17 from MichaelTheShifter/shiftui_integration
Shiftui integration
Diffstat (limited to 'README.md')
-rw-r--r--README.md3
1 files changed, 2 insertions, 1 deletions
diff --git a/README.md b/README.md
index b8f5731..5a8c3e6 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
-# THIS BRANCH IS ON FEATURE FREEZE. PLEASE DEVELOP ON PR #17!
# ShiftOS
+Developer chat: [![Chat on Slack](http://jsoxford.com/img/icons/slack.svg)](https://shiftos.slack.com)
+
[![Join the chat at https://gitter.im/MichaelTheShifter/ShiftOS-C-](https://badges.gitter.im/MichaelTheShifter/ShiftOS-C-.svg)](https://gitter.im/MichaelTheShifter/ShiftOS-C-?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Build status](https://ci.appveyor.com/api/projects/status/w40gyl8c2x2wy5su/branch/master?svg=true)](https://ci.appveyor.com/project/MichaelTheShifter/shiftos-c/branch/master)
Welcome to the official C# rewrite of the original ShiftOS 0.0.9. It is led by Michael VanOverbeek and developed by the community.