diff options
author | Brion Vibber <brion@pobox.com> | 2010-06-28 13:41:04 -0400 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-06-28 13:41:04 -0400 |
commit | fdd9aa58e3caf87096e1c1dcfa8b2f286b04e4b1 (patch) | |
tree | a13d2d491edbea68f7e418df7b4075d2129c501a /tests/sample-uploads/presentation.otp | |
parent | fa282823d9834d411bf2434be1406d4c2ca09b2c (diff) | |
parent | 53f14ddde6d3c48063c2419916f6961580bb66c3 (diff) |
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
Diffstat (limited to 'tests/sample-uploads/presentation.otp')
-rw-r--r-- | tests/sample-uploads/presentation.otp | bin | 0 -> 9359 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/tests/sample-uploads/presentation.otp b/tests/sample-uploads/presentation.otp Binary files differnew file mode 100644 index 000000000..1927ee79d --- /dev/null +++ b/tests/sample-uploads/presentation.otp |