From: Zach Copley Date: Tue, 8 Mar 2011 05:35:48 +0000 (-0800) Subject: Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=cfe3e832932ace9c5ad028899a7765b206eaab81;p=quix0rs-gnu-social.git Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x * '1.0.x' of gitorious.org:statusnet/mainline: Initial checkin of Poll plugin: micro-app to post mini polls/surveys from the notice form. Localisation updates from http://translatewiki.net. More doc comments on MicroApp stuff; some of the show-notice code & the ActivityStreams stuff is a bit wonky and may need smoothing out Doc comments for MicroAppPlugin mailboxes were wrongly overriding global menu --- cfe3e832932ace9c5ad028899a7765b206eaab81