diff options
| author | René 'Necoro' Neumann <necoro@necoro.net> | 2010-04-09 23:43:44 +0200 |
|---|---|---|
| committer | René 'Necoro' Neumann <necoro@necoro.net> | 2010-04-09 23:43:44 +0200 |
| commit | d8c4bacde00e2be0e5d5aaf7f85f139aae6a95d6 (patch) | |
| tree | 12f088e6c07b690cccbcc073b744dc5760713918 /portato/backend/catapult/system.py | |
| parent | 3cc84485184c1662fabb53f35df43a539021ff93 (diff) | |
| parent | 359309950a1283dbbf9df6ce1085838087cfc262 (diff) | |
| download | portato-no_config.tar.gz portato-no_config.tar.bz2 portato-no_config.zip | |
Merge branch 'master' into no_config to pickup the recent changes andno_config
fixes.
Conflicts:
portato/db/__init__.py
portato/session.py
Diffstat (limited to 'portato/backend/catapult/system.py')
0 files changed, 0 insertions, 0 deletions