]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
authorEvan Prodromou <evan@status.net>
Thu, 7 Jul 2011 14:27:54 +0000 (10:27 -0400)
committerEvan Prodromou <evan@status.net>
Thu, 7 Jul 2011 14:27:54 +0000 (10:27 -0400)
commitfeb53619cfbc9fdb7d9dd0ad232b3aa81e9bc0e2
treeb3a2e7d488b28ed91e995cc5a845dc631dd41683
parent1598050f540a367df8fe310e3b7571c430dd32ec
parentf0af9f45ddd52fa5e62a76cdcae08d1369757f9d
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x

Conflicts:
js/util.min.js
theme/base/css/display.css