From fa0dd27f33478a6213631e97eba50fdbb922e7fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Magr=C3=AD?= Date: Sun, 22 Dec 2013 19:24:37 -0430 Subject: [PATCH 1/2] Add MySQL-python to the project's requirements --- requirements.txt | 1 + 1 file changed, 1 insertion(+) 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 From b2107c64d60414379ef704c4e286dd0c80102762 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Magr=C3=AD?= Date: Sun, 27 Apr 2014 06:50:23 -0430 Subject: [PATCH 2/2] Update README.mkd --- README.mkd | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) 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``.