]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'nightly' of gitorious.org:social/mainline into nightly
authorRoland Haeder <roland@mxchange.org>
Tue, 10 Mar 2015 17:17:50 +0000 (18:17 +0100)
committerRoland Haeder <roland@mxchange.org>
Tue, 10 Mar 2015 17:18:38 +0000 (18:18 +0100)
Signed-off-by: Roland Haeder <roland@mxchange.org>
1  2 
classes/Notice.php
lib/default.php
lib/installer.php
lib/noticelistitem.php
plugins/AnonymousFave/actions/anonfavor.php
plugins/Favorite/actions/apifavoritecreate.php

Simple merge
diff --cc lib/default.php
Simple merge
Simple merge
Simple merge