diff --git a/README.mkd b/README.mkd index b00d248..b0d8eee 100644 --- a/README.mkd +++ b/README.mkd @@ -1,9 +1,3 @@ -# Disclaimer for Devs - -Right now the master branch is freezed. - -All ongoing work is being done in the django15 branch to settle the basis for future developments. - # MozBuzz MozBuzz is a tool for tracking brand and product mentions in the press. @@ -20,6 +14,10 @@ https://github.com/mozillahispano/mozbuzz https://github.com/mozillahispano/mozbuzz/issues +### Disclaimer for Devs + +Please send Pull Requests against the `development` branch, unless it is a fix for a bug in `master`. + ### Documentation Documentation is in the ``docs/`` directory including docs for @@ -30,11 +28,6 @@ Most recent docs are at [readthedocs.org](https://mozzbuzz.readthedocs.org/en/la ### IRC Channel ``mozbuzz`` on ``irc.mozilla.org`` - -## Want to help? -TODO: inspiraciĆ³n - - ## License This software is licensed under the [GPLv3][GPL]. For more information, read the file ``LICENSE``. diff --git a/requirements.txt b/requirements.txt index ea79e1a..721ac81 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,5 @@ Django==1.5.1 +MySQL-python==1.2.3 South==0.7.6 certifi==0.0.8 chardet==2.1.1