diff options
| author | Brion Vibber <brion@pobox.com> | 2010-11-02 15:02:10 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-11-02 15:02:10 -0700 |
| commit | 04ca706601a2a3b556cc52fa21b61fcd842c4e87 (patch) | |
| tree | df79bc06e080623c4d2107ae8ce212160c7669b1 /apple-touch-icon.png | |
| parent | b26eccf33cf69c04a96d5d6d3eddc0ef68ffd4b1 (diff) | |
| parent | 81e06530800bce5eb60eca362d4c21453632183a (diff) | |
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
Conflicts:
actions/confirmaddress.php
actions/othersettings.php
Diffstat (limited to 'apple-touch-icon.png')
0 files changed, 0 insertions, 0 deletions