]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge remote-tracking branch 'upstream/master'
authorRoland Häder <haeder@hmmdeutschland.de>
Fri, 9 Jan 2015 07:55:34 +0000 (08:55 +0100)
committerRoland Häder <haeder@hmmdeutschland.de>
Fri, 9 Jan 2015 07:55:34 +0000 (08:55 +0100)
commit1111187d845ecd34eba1c03473f6adbc08f6ca15
tree672c5b709ba4ffea317672c5e2fcd5489b65c4b7
parentd3ef7d81e60c660b574aa681dcc7aed77841f509
parentd02f3c4648210205520606cf7ef883f44db3beb6
Merge remote-tracking branch 'upstream/master'

Conflicts:
plugins/Poll/lib/polllistitem.php

Signed-off-by: Roland Häder <haeder@hmmdeutschland.de>
lib/default.php
lib/framework.php
lib/noticelistitem.php
plugins/Blog/BlogPlugin.php
plugins/DirectMessage/classes/Message.php
plugins/ExtendedProfile/ExtendedProfilePlugin.php
plugins/OStatus/classes/Ostatus_profile.php
plugins/SearchSub/SearchSubPlugin.php
plugins/TagSub/TagSubPlugin.php
scripts/createsim.php
scripts/upgrade.php