projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 140886a 9aa5c2f)
Merge remote-tracking branch 'upstream/develop' into 1606-contact-id
authorMichael Vogel <icarus@dabo.de>
Mon, 20 Jun 2016 05:28:47 +0000 (07:28 +0200)
committerMichael Vogel <icarus@dabo.de>
Mon, 20 Jun 2016 05:28:47 +0000 (07:28 +0200)
1  2 
include/bbcode.php patch | diff1 | diff2 | blob | history

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