]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'upstream/develop' into 1501-enhanced-poco
authorMichael Vogel <icarus@dabo.de>
Sun, 4 Jan 2015 18:32:08 +0000 (19:32 +0100)
committerMichael Vogel <icarus@dabo.de>
Sun, 4 Jan 2015 18:32:08 +0000 (19:32 +0100)
commit7084adfd1cd0e36394f09c7925f4dbd1922926ee
tree636664ca92665e988d55c125dc70af04d9a26e75
parent11c82816b330f247ce317d064f91c1ac7dd72990
parentd9f28b9b1cf05524f2d2d1f3b8754ea408cd5673
Merge remote-tracking branch 'upstream/develop' into 1501-enhanced-poco

Conflicts:
boot.php
update.php
include/dbstructure.php