Skip to content

Commit 3b95c23

Browse files
committed
Both branches can share a readme
1 parent a2c14b0 commit 3b95c23

1 file changed

Lines changed: 10 additions & 6 deletions

File tree

README.md

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
1-
# CloudBot [![Build Status](https://travis-ci.org/CloudBotIRC/CloudBot.svg?branch=master)](https://travis-ci.org/CloudBotIRC/CloudBot) [![Coverage Status](https://coveralls.io/repos/CloudBotIRC/CloudBot/badge.png?branch=master)](https://coveralls.io/r/CloudBotIRC/CloudBot?branch=master)
1+
# CloudBot
22

3-
CloudBot Refresh is the newest generation of CloudBot, the fun, fast, extendable Python IRC bot!
3+
CloudBot is a simple, fast, extendable open-source Python IRC Bot!
4+
5+
## Getting CloudBot
6+
7+
There are currently two different branches of this repository, each with a different level of stability:
8+
- **master**: This branch contains stable, tested code. This is the branch you should be using if you just want to run your own CloudBot!
9+
- **python3.4**: This branch is where where test and develop new features. If you would like to help develop CloudBot, you can use this branch.
10+
11+
New releases will be pushed from **python3.4** to **master** whenever we have a stable version to release.
412

513
## Installing CloudBot
614

@@ -10,10 +18,6 @@ To install CloudBot on *nix (linux, etc), see [here](https://github.com/CloudBot
1018

1119
To install CloudBot on Windows, see [here](https://github.com/CloudBotIRC/CloudBot/wiki/Installing-on-Windows)
1220

13-
If you're going to be actively developing on CloudBot, and submitting PRs back, you can run CloudBot inside Vagrant. This allows everyone to have an identical development environment.
14-
15-
To install CloudBot in Vagrant (both *Unix and Windows), see [here](https://github.com/CloudBotIRC/CloudBot/wiki/Installing-with-Vagrant)
16-
1721

1822
### Running CloudBot
1923

0 commit comments

Comments
 (0)