diff options
| author | Zach Copley <zach@controlyourself.ca> | 2009-06-14 00:23:48 +0000 |
|---|---|---|
| committer | Zach Copley <zach@controlyourself.ca> | 2009-06-14 00:23:48 +0000 |
| commit | d0eb2058a519941e205f7b0960d9a5e0707207bb (patch) | |
| tree | 37ed1aa1be3c3a7a58463964ce602565c79f8cdf /classes/laconica.ini | |
| parent | a887d4fe8b1f5e5adc2d701384acf50cf2cf54c3 (diff) | |
| parent | dbbb3a4fb558ee4372e157612f3e053a87a53a8e (diff) | |
Merge branch '0.8.x' into userdesign
Conflicts:
actions/showfavorites.php
lib/action.php
Diffstat (limited to 'classes/laconica.ini')
0 files changed, 0 insertions, 0 deletions