]> git.mxchange.org Git - friendica.git/commitdiff
Merge branch 'hotfix_diaspora' into develop
authorFabrixxm <fabrix.xm@gmail.com>
Wed, 20 Jan 2016 07:50:18 +0000 (08:50 +0100)
committerFabrixxm <fabrix.xm@gmail.com>
Wed, 20 Jan 2016 07:50:18 +0000 (08:50 +0100)
1  2 
include/diaspora.php
include/items.php
include/notifier.php
mod/item.php

Simple merge
Simple merge
Simple merge
diff --cc mod/item.php
Simple merge