]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
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)
commitf4ec1c998d29cb4f9335e15e65cd43ff035583d2
treeb0f3f3b7bc725cdf45d357db22738d423d99d960
parent6ae8633904ffab0fdadd5fe3b2de2f505117c56f
parentce0b22157373b3914fd8211e0850c65ef2280755
Merge branch 'nightly' of gitorious.org:social/mainline into nightly

Conflicts:
plugins/VideoThumbnails/VideoThumbnailsPlugin.php

Signed-off-by: Roland Haeder <roland@mxchange.org>
classes/File.php
lib/imagefile.php
plugins/VideoThumbnails/VideoThumbnailsPlugin.php