]> 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: e40014b dbdac9c)
Merge branch 'master' of git.gnu.io:gnu/gnu-social into nightly
authorMikael Nordfeldth <mmn@hethane.se>
Fri, 6 Nov 2015 12:39:17 +0000 (13:39 +0100)
committerMikael Nordfeldth <mmn@hethane.se>
Fri, 6 Nov 2015 12:39:17 +0000 (13:39 +0100)
1  2 
lib/noticelistitem.php patch | diff1 | diff2 | blob | history
theme/base/css/display.css patch | diff1 | diff2 | blob | history

diff --cc lib/noticelistitem.php
Simple merge
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. :-)