Merge upstream changes

This commit is contained in:
Fabian Würfl
2018-06-01 17:02:12 +02:00
11 changed files with 632 additions and 129 deletions

View File

@ -1,4 +1,17 @@
# botamusique
**Info:**
> This is a fork of the official repository (located [here](https://github.com/azlux/botamusique)).
We are working on various features for our own version of the bot. However, we will
regularly merge upstream changes and will also create pull requests to merge back our
features to the upstream repo at some point.
The remainder of this readme is from the original repo.
Note that the ToDo list at the end of the Readme is **outdated** and **not applicable** for this repository.
---
[Version Française ici](README.fr.md)
======