]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch 'master' into social-master
authorRoland Haeder <roland@mxchange.org>
Sun, 15 Feb 2015 21:46:00 +0000 (22:46 +0100)
committerRoland Haeder <roland@mxchange.org>
Sun, 15 Feb 2015 21:46:00 +0000 (22:46 +0100)
commitf8e7d426530e02fd10c6756668c6338a01f78a4b
treead69646c6741fe9dbcd7402ece2f6898b63a9d87
parent27c4f57ded7102f63285e27a4f7471b881c8cc83
parent1269e3f22315ab7bb2d4c355fb8b655f2db41b0b
Merge branch 'master' into social-master

Conflicts:
classes/File.php
plugins/Recaptcha/RecaptchaPlugin.php
plugins/UserLimit/UserLimitPlugin.php

Signed-off-by: Roland Haeder <roland@mxchange.org>
classes/File.php
classes/File_thumbnail.php
classes/Notice.php
lib/imagefile.php
lib/noticeform.php
plugins/OStatus/OStatusPlugin.php
plugins/Oembed/classes/File_oembed.php
plugins/QnA/classes/QnA_Answer.php