Mikael Nordfeldth 7ccd36849e Merge branch 'master' of git.gnu.io:gnu/gnu-social into nightly ...

Conflicts:
	plugins/OStatus/OStatusPlugin.php

master vs. nightly thing

2015-11-05 16:16:02 +01:00

..

actions

Allow users to opt out of sending linkbacks

2015-10-18 21:28:55 +00:00

locale

Snapshot of the Transifex translation project - October 2015

2015-10-04 18:23:01 +02:00

LinkbackPlugin.php

Merge branch 'master' of git.gnu.io:gnu/gnu-social into nightly

2015-11-05 16:16:02 +01:00