diff options
author | Patrick Totzke <patricktotzke@gmail.com> | 2012-05-17 15:47:23 +0100 |
---|---|---|
committer | Patrick Totzke <patricktotzke@gmail.com> | 2012-05-17 15:47:23 +0100 |
commit | 08c2ee1d88e69aa5df27b74d1cebd3c0c8be68f6 (patch) | |
tree | 2dde7d7db9146918242f2c289c64e587706b3f09 /NEWS | |
parent | 138f13c682f6a63da67cced1f0c267b5f6f349b8 (diff) | |
parent | 56b0b8a0f310403d4664649ab9b69d3cd765dbe5 (diff) |
Merge branch '0.3-feature-pyme' into staging
Conflicts:
alot/settings/__init__.py
alot/settings/checks.py
docs/source/generate_configs.py
Diffstat (limited to 'NEWS')
0 files changed, 0 insertions, 0 deletions