diff options
author | Zach Copley <zach@status.net> | 2009-11-18 12:48:17 -0800 |
---|---|---|
committer | Zach Copley <zach@status.net> | 2009-11-18 12:48:17 -0800 |
commit | 8f2db3820f6ab2c8881521c0adc9a6427b5ea86b (patch) | |
tree | 468438bbb16ddaaa4960ec6079fb6acf754b61cf /lib/default.php | |
parent | 9baddf4e44e173e3e70c4c3f2198857f16320544 (diff) | |
parent | 645b7dec2b40fb9c34306e7b445a120c6c09382d (diff) |
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
* '0.9.x' of gitorious.org:statusnet/mainline:
Terminology consistency fix: 'Unlock' -> 'Unblock' in unblock form description.
Localisation updates from !translatewiki !StatusNet
Check for dupe from insertNoticeItem()
Diffstat (limited to 'lib/default.php')
0 files changed, 0 insertions, 0 deletions