]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
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
lib/default.php

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