summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-03-03 09:53:38 -0800
committerBrion Vibber <brion@pobox.com>2010-03-03 09:53:38 -0800
commit7313cd909479f771e960466d9194783c9a3158bb (patch)
tree318734efe06c9de904364f04cb76e1c54b75e269 /Makefile
parent49a872b56f82a3f1ba59f0751c11dfe7754393dd (diff)
parentf3cea2430497e751bc7776fe3abf0603e2b55f8b (diff)
Merge branch 'testing' of git@gitorious.org:statusnet/mainline
Conflicts: plugins/OStatus/OStatusPlugin.php
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions