]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9baddf4 645b7de)
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
authorZach Copley <zach@status.net>
Wed, 18 Nov 2009 20:48:17 +0000 (12:48 -0800)
committerZach Copley <zach@status.net>
Wed, 18 Nov 2009 20:48:17 +0000 (12:48 -0800)
* '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()


Trivial merge
This is my personal clone from the wonderful software GNUSocial. I may fix or break things here, so use it on your own risk. :-)