]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
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
theme/base/css/display.css

Simple merge
Simple merge