]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch 'nightly' of gitorious.org:social/mainline into nightly
authorRoland Häder <haeder@hmmdeutschland.de>
Mon, 26 Jan 2015 13:37:06 +0000 (14:37 +0100)
committerRoland Häder <haeder@hmmdeutschland.de>
Mon, 26 Jan 2015 13:37:14 +0000 (14:37 +0100)
commit51b1bab98ee75ae765d5cfad8b11027ec0b03a90
tree12d7bf8258592b248c6472732c099d3005e811c7
parentd15fb62d3ca761370a1d3c3d93b559345247a51f
parent7beec74f0c5829b6a9e29988ae7c5f4f6bb7eb0a
Merge branch 'nightly' of gitorious.org:social/mainline into nightly

Signed-off-by: Roland Häder <haeder@hmmdeutschland.de>
classes/File.php
classes/User_group.php
lib/default.php
lib/imagefile.php
plugins/OStatus/OStatusPlugin.php