]> 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: 1598050 f0af9f4)
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)
Conflicts:
js/util.min.js

1  2 
theme/base/css/display.css patch | diff1 | diff2 | blob | history

diff --cc theme/base/css/display.css
Simple 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. :-)