]> 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, 8 Mar 2015 23:36:00 +0000 (00:36 +0100)
committerRoland Haeder <roland@mxchange.org>
Sun, 8 Mar 2015 23:36:00 +0000 (00:36 +0100)
commitf0b54b9b6438c6c2ef7394df17557004da151785
tree497dd821c95fdf69ad244de9b61219f4315f67f2
parent70ca9624d546402d6dd49d745f894bb18638feb3
parent8ae1328e71fd10bba768d75f93e91d33bb574551
Merge branch 'nightly' of gitorious.org:social/mainline into nightly

Conflicts:
plugins/OStatus/OStatusPlugin.php

Signed-off-by: Roland Haeder <roland@mxchange.org>
lib/formaction.php
plugins/OStatus/OStatusPlugin.php
plugins/OStatus/classes/Ostatus_profile.php