diff options
| author | Morgan Collett <morgan.collett@gmail.com> | 2007-10-12 13:20:40 (GMT) |
|---|---|---|
| committer | Morgan Collett <morgan.collett@gmail.com> | 2007-10-12 13:20:40 (GMT) |
| commit | 8c86c7b57646fdfe97ccd2e08bb655f465090930 (patch) | |
| tree | 54f1da183c9434b142f16ecae3da8a740a1c116a | |
| parent | aa58099f2f9e74b35353b5cbaaafee86ca09f15f (diff) | |
| parent | 03d644f70ee208294d631ff8badec0de8e85f0d4 (diff) | |
Merge branch 'master' of git+ssh://dev.laptop.org/git/projects/hellomesh into 3949
Conflicts:
activity.py
| -rw-r--r-- | NEWS | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -1,2 +1,3 @@ +* Fix logging error (morgs) * Actually fix offering a tube (smcv) * Port to new Tubes API (morgs) |