]> 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 15:39:20 +0000 (16:39 +0100)
committerRoland Häder <haeder@hmmdeutschland.de>
Mon, 26 Jan 2015 15:39:24 +0000 (16:39 +0100)
commitb017675976840cb3622eb801af3dbc7caa93e605
tree5c1cba1d7b01bec192271d085f8737a952be0c72
parent51b1bab98ee75ae765d5cfad8b11027ec0b03a90
parent67d09532ddb324897d8222b5b8744b0118e72d70
Merge branch 'nightly' of gitorious.org:social/mainline into nightly

Signed-off-by: Roland Häder <haeder@hmmdeutschland.de>
classes/File.php
lib/attachmentlistitem.php
lib/default.php