diff options
| author | Sarven Capadisli <csarven@status.net> | 2010-03-04 11:57:40 -0500 |
|---|---|---|
| committer | Sarven Capadisli <csarven@status.net> | 2010-03-04 11:57:40 -0500 |
| commit | ef6620e5b2787ce5ee34974f3770be1d9963be4a (patch) | |
| tree | ccd6c3b5d39ffdb350ab8a412ab492f1529167d7 /classes/status_network.ini | |
| parent | 1831506885ad31c14eb1c4c87274c299fbf39957 (diff) | |
| parent | 02f49193d5eaee108899b38678334f775dee596f (diff) | |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'classes/status_network.ini')
0 files changed, 0 insertions, 0 deletions