]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch 'nightly' of gitorious.org:social/mainline into nightly
authorRoland Haeder <roland@mxchange.org>
Sun, 25 Jan 2015 12:57:28 +0000 (13:57 +0100)
committerRoland Haeder <roland@mxchange.org>
Sun, 25 Jan 2015 12:57:28 +0000 (13:57 +0100)
commitd15fb62d3ca761370a1d3c3d93b559345247a51f
treee57f40b3101eca588971b2fab9b15b759a25cd57
parentccfeefc874686101f7425cc9d1bdd3841c4cba09
parent470971cf4747f2eec548891769c340295a45cb22
Merge branch 'nightly' of gitorious.org:social/mainline into nightly

Signed-off-by: Roland Haeder <roland@mxchange.org>
Conflicts:
classes/File.php
14 files changed:
actions/apimediaupload.php
actions/attachment.php
actions/confirmaddress.php
actions/recoverpassword.php
classes/File.php
classes/Notice.php
lib/default.php
lib/framework.php
lib/imagefile.php
plugins/Mapstraction/actions/map.php
plugins/OStatus/OStatusPlugin.php
plugins/OStatus/lib/magicenvelope.php
scripts/clear_jabber.php
scripts/registeruser.php