]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Sun, 20 Jan 2013 13:07:57 +0000 (14:07 +0100)
committerMichael Vogel <icarus@dabo.de>
Sun, 20 Jan 2013 13:07:57 +0000 (14:07 +0100)
commit4e3d0018c69eaaa122f004357c5c68dacef59fc7
treeed1f6c5d3954776f074887a5fb614c53c53f9618
parent82c00660e099070cf4dee8de82c2023d1232ef8d
parent3742d0d5babd8947fdcf5a33db90035541a5fe75
Merge remote-tracking branch 'upstream/master'

Conflicts:
boot.php
include/items.php
update.php
boot.php
database.sql
include/bbcode.php
include/conversation.php
include/items.php
include/text.php
object/Item.php
update.php