summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2009-01-30 11:37:51 -0500
committerMicah Anderson <micah@riseup.net>2009-01-30 11:37:51 -0500
commit8e6fcc118095adc58335c594f50d367393d8f61a (patch)
treef5b7ea93c3d6f39c9221bb96523f51b009f1d9c3 /.gitignore
parent930b0742dc2cf88015272057374ca68c94e40597 (diff)
parentfed9bf92f82bac4a329866896802c3f0f8b08059 (diff)
Merge branch 'master' of git+ssh://labs.riseup.net/~micah/public_git/monkeysphere
Conflicts: doc/george/changelog
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions