diff options
author | Zach Copley <zach@status.net> | 2010-02-22 17:12:33 -0800 |
---|---|---|
committer | Zach Copley <zach@status.net> | 2010-02-22 17:12:33 -0800 |
commit | cbf6ebae014dace4ab1e8b85b95e1bfffb1580e8 (patch) | |
tree | 1f466c3c1dddd7c1e3e1d1de0a83cef786396c83 /.gitignore | |
parent | 870e556faafa6222bd0e877bd6017ad9277deb4c (diff) | |
parent | 6a711c6cdc5d1e1b1a64e5858b12e6964a0abe9c (diff) |
Merge branch 'rationalize-activity' into testing
* rationalize-activity:
Move ActivityObject and related stuff to core
Add PoCo bits, avatar link, geo point, etc. to person activity obj output
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions