summaryrefslogtreecommitdiff
path: root/portato/plugin.py
diff options
context:
space:
mode:
authorRené 'Necoro' Neumann <necoro@necoro.net>2010-04-09 23:43:44 +0200
committerRené 'Necoro' Neumann <necoro@necoro.net>2010-04-09 23:43:44 +0200
commitd8c4bacde00e2be0e5d5aaf7f85f139aae6a95d6 (patch)
tree12f088e6c07b690cccbcc073b744dc5760713918 /portato/plugin.py
parent3cc84485184c1662fabb53f35df43a539021ff93 (diff)
parent359309950a1283dbbf9df6ce1085838087cfc262 (diff)
downloadportato-d8c4bacde00e2be0e5d5aaf7f85f139aae6a95d6.tar.gz
portato-d8c4bacde00e2be0e5d5aaf7f85f139aae6a95d6.tar.bz2
portato-d8c4bacde00e2be0e5d5aaf7f85f139aae6a95d6.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 '')
0 files changed, 0 insertions, 0 deletions