aboutsummaryrefslogtreecommitdiffstats
path: root/setup.py
diff options
context:
space:
mode:
authorJoar Wandborg <git@wandborg.com>2012-06-10 15:53:46 +0200
committerJoar Wandborg <git@wandborg.com>2012-06-10 15:53:46 +0200
commit879ff4bde6afaee8bf5bdc2a0e659d66e767d424 (patch)
tree71c9031f785f490f82d2fb7360b72b0f6007e2fe /setup.py
parenta855e92a985a9bdc9c5062cad268eba3d8e19f84 (diff)
parentfa72e516897a370b1e47e5f0ff17155990cd2414 (diff)
downloadmediagoblin-879ff4bde6afaee8bf5bdc2a0e659d66e767d424.tar.lz
mediagoblin-879ff4bde6afaee8bf5bdc2a0e659d66e767d424.tar.xz
mediagoblin-879ff4bde6afaee8bf5bdc2a0e659d66e767d424.zip
Merge remote-tracking branch 'is_derek/bug405_email_notifications_for_comments' into notifications-merge
Conflicts: mediagoblin/db/mongo/migrations.py
Diffstat (limited to 'setup.py')
0 files changed, 0 insertions, 0 deletions