diff options
| author | Brion Vibber <brion@pobox.com> | 2010-10-04 11:42:16 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-10-04 11:42:16 -0700 |
| commit | 5b49366f49b77fd677f415facb75c9b21c10b5d3 (patch) | |
| tree | b38bb4dc936d77a07d51f67e0eacc63c2d6239e2 /lib/designsettings.php | |
| parent | 7d0d89ddea7ae21f7c1526c170a20aa865d7c376 (diff) | |
| parent | 1652ded48c9c62c40157a5142e5231adbc574ddb (diff) | |
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
Conflicts:
plugins/AnonymousFave/AnonymousFavePlugin.php
Diffstat (limited to 'lib/designsettings.php')
0 files changed, 0 insertions, 0 deletions