]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch 'nightly' of gitorious.org:social/mainline into nightly
authorRoland Haeder <roland@mxchange.org>
Sat, 31 Jan 2015 15:38:44 +0000 (16:38 +0100)
committerRoland Haeder <roland@mxchange.org>
Sat, 31 Jan 2015 15:38:44 +0000 (16:38 +0100)
commit0b4115b2496c830fb0a4373bcc9a27050899db55
treeb3e5835d3542a6e747b293e80921be423bba554c
parentd76de2300c0746973ffb8d99b3580902312b96e1
parenteff3256f5937204f883207781c50399e9b6fd9b2
Merge branch 'nightly' of gitorious.org:social/mainline into nightly

Signed-off-by: Roland Haeder <roland@mxchange.org>
Conflicts:
actions/apistatusesshow.php
actions/apitimelinepublic.php
actions/logout.php
actions/public.php
12 files changed:
actions/apistatusesshow.php
actions/apitimelinepublic.php
actions/logout.php
actions/public.php
actions/replies.php
actions/shownotice.php
actions/showprofiletag.php
actions/tag.php
classes/Notice.php
lib/router.php
plugins/Favorite/actions/showfavorites.php
plugins/Oembed/actions/oembed.php