]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
authorZach Copley <zach@status.net>
Tue, 5 Apr 2011 00:32:06 +0000 (17:32 -0700)
committerZach Copley <zach@status.net>
Tue, 5 Apr 2011 00:32:06 +0000 (17:32 -0700)
commit4fea74691364250b9b38493ce6671d9f9b216815
tree330b3860692d8ba9509a0c0bf46dcc9c003d196b
parent559a688e4256918cb405fbf82a2bc266ea9ac35b
parenta3ba11a8ac15449cedb99f0eb847bbd2301a7012
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x

* '1.0.x' of gitorious.org:statusnet/mainline:
  Style for QnA plugin.