]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch 'nightly' of gitorious.org:social/mainline into nightly
authorRoland Haeder <roland@mxchange.org>
Sun, 8 Mar 2015 19:51:53 +0000 (20:51 +0100)
committerRoland Haeder <roland@mxchange.org>
Sun, 8 Mar 2015 19:51:53 +0000 (20:51 +0100)
commitfd220b1cf8d9846c99f8ee7014dd147737f62b8a
tree0a02f487730127d7031aa20e93502c9bb06fd50d
parentbb9edc8a59942a97be5ce42959a9386031871355
parent1442ca16b410d327d7ec6269944144dfa075ff17
Merge branch 'nightly' of gitorious.org:social/mainline into nightly

Conflicts:
actions/replies.php

Signed-off-by: Roland Haeder <roland@mxchange.org>
actions/replies.php
lib/noticelistitem.php