]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f652265 f1697d3)
Merge branch 'develop' of github.com:annando/friendica into 1410-remote-self
authorMichael Vogel <icarus@dabo.de>
Mon, 27 Oct 2014 10:45:39 +0000 (11:45 +0100)
committerMichael Vogel <icarus@dabo.de>
Mon, 27 Oct 2014 10:45:39 +0000 (11:45 +0100)
1  2 
include/items.php patch | diff1 | diff2 | blob | history

diff --cc include/items.php
Simple merge
Unnamed repository; edit this file 'description' to name the repository.