diff options
| author | Patrick Totzke <patricktotzke@gmail.com> | 2011-09-23 17:02:53 +0100 |
|---|---|---|
| committer | Patrick Totzke <patricktotzke@gmail.com> | 2011-09-23 17:02:53 +0100 |
| commit | db6e7c2842f41d5f5efaf2392e83a9f7bee95021 (patch) | |
| tree | 552ef277804364348b3081ced7804917d5a62247 /README.md | |
| parent | a4530960317575e379373ffd38fd05c0ce4c304d (diff) | |
| parent | 6a32255f17e3b1e2e61b437456fea904535a6ec5 (diff) | |
Merge branch 'develop'
Conflicts:
README.md
alot/defaults/alot.rc
alot/init.py
alot/settings.py
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 3 |
1 files changed, 0 insertions, 3 deletions
@@ -9,9 +9,6 @@ the `docs` directory contains their sources. Do comment on the code or file issues! I'm curious what you think of it. You can talk to me in #notmuch@Freenode. -Be aware that the master branch is used only for releases and hotfixes, -the bleeding edge version sits in branch `development`!. -If you'd like to contribute, please make sure your patches can be applied to that branch. Current features include: ------------------------- |