- Committer: William Grant
- Date: 2011-12-22 12:37:42 UTC
- mfrom: (14580 devel)
- Revision ID: william.grant@canonical.com-20111222123742-knbahyqz7vx0ptne
Merge devel, resolving conflict.
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
__init__.py |
13387.1.2 | 13 years ago | Francis J. Lacoste | Add IJSONPublishable adapter for timedelta. | Empty |
|
|
|
test_json.py |
14550.1.1 | 13 years ago | Steve Kowalik | Run format-imports over lib/lp and lib/canonical/l | 972 bytes |
|
|