]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge remote-tracking branch 'upstream/master' into social-master
authorRoland Haeder <roland@mxchange.org>
Sun, 3 Jan 2016 17:55:37 +0000 (18:55 +0100)
committerRoland Haeder <roland@mxchange.org>
Sun, 3 Jan 2016 17:55:37 +0000 (18:55 +0100)
commite2d85a39e7f82ceef2cb2fe66a3a9a62ac9a363e
tree79476464e009797bd4544f58290a80aa29c9683d
parent9b7773343460514c5c5811c9add5cd96a2770c42
parent0dfafe256709b918362e48e2340f8d07fb421f54
Merge remote-tracking branch 'upstream/master' into social-master

Signed-off-by: Roland Haeder <roland@mxchange.org>
24 files changed:
.gitignore
actions/noticesearch.php
actions/recoverpassword.php
classes/Confirm_address.php
classes/File_redirection.php
classes/File_thumbnail.php
classes/Notice.php
lib/attachmentlistitem.php
lib/default.php
lib/installer.php
lib/noticelistitem.php
lib/util.php
plugins/Autocomplete/actions/autocomplete.php
plugins/Event/EventPlugin.php
plugins/Event/actions/cancelrsvp.php
plugins/Event/classes/Happening.php
plugins/Event/classes/RSVP.php
plugins/OStatus/classes/Ostatus_profile.php
plugins/Oembed/classes/File_oembed.php
plugins/QnA/actions/qnanewanswer.php
plugins/Xmpp/XmppPlugin.php
scripts/nukefile.php
scripts/setpassword.php
scripts/upgrade.php