]> 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: b53e143 e4a17fe)
Merge remote-tracking branch 'upstream/master' into social-master
authorRoland Haeder <roland@mxchange.org>
Wed, 6 May 2015 07:09:31 +0000 (09:09 +0200)
committerRoland Haeder <roland@mxchange.org>
Wed, 6 May 2015 07:09:31 +0000 (09:09 +0200)
1  2 
classes/File_thumbnail.php patch | diff1 | diff2 | blob | history
lib/default.php patch | diff1 | diff2 | blob | history

diff --cc classes/File_thumbnail.php
Simple merge
diff --cc lib/default.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. :-)