]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6ae8633 ce0b221)
Merge branch 'nightly' of gitorious.org:social/mainline into nightly
authorRoland Haeder <roland@mxchange.org>
Wed, 25 Feb 2015 01:30:21 +0000 (02:30 +0100)
committerRoland Haeder <roland@mxchange.org>
Wed, 25 Feb 2015 01:30:21 +0000 (02:30 +0100)
Conflicts:
plugins/VideoThumbnails/VideoThumbnailsPlugin.php

Signed-off-by: Roland Haeder <roland@mxchange.org>
1  2 
classes/File.php patch | diff1 | diff2 | blob | history
lib/imagefile.php patch | diff1 | diff2 | blob | history
plugins/VideoThumbnails/VideoThumbnailsPlugin.php patch | diff1 | diff2 | blob | history

diff --cc classes/File.php
Simple merge
diff --cc lib/imagefile.php
Simple merge
This is my personal clone from the wonderful software GNUSocial. I may fix or break things here, so use it on your own risk. :-)