]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
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)
Signed-off-by: Roland Häder <haeder@hmmdeutschland.de>
1  2 
classes/File.php
lib/attachmentlistitem.php
lib/default.php

Simple merge
Simple merge
diff --cc lib/default.php
Simple merge