]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'nightly' of gitorious.org:social/mainline into nightly
authorRoland Haeder <roland@mxchange.org>
Fri, 6 Mar 2015 00:43:25 +0000 (01:43 +0100)
committerRoland Haeder <roland@mxchange.org>
Fri, 6 Mar 2015 00:43:32 +0000 (01:43 +0100)
Signed-off-by: Roland Haeder <roland@mxchange.org>
1  2 
lib/action.php
lib/attachmentlistitem.php
lib/imagefile.php
plugins/VideoThumbnails/VideoThumbnailsPlugin.php

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