]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1a26d46 209e957)
Merge remote-tracking branch 'upstream/develop' into 1506-tag-users
authorMichael Vogel <icarus@dabo.de>
Tue, 2 Jun 2015 21:19:00 +0000 (23:19 +0200)
committerMichael Vogel <icarus@dabo.de>
Tue, 2 Jun 2015 21:19:00 +0000 (23:19 +0200)
1  2 
mod/item.php patch | diff1 | diff2 | blob | history

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