]> git.mxchange.org Git - friendica.git/commitdiff
Merge remote-tracking branch 'upstream/develop' into issue-1218
authorMichael Vogel <icarus@dabo.de>
Sun, 4 Jan 2015 19:21:49 +0000 (20:21 +0100)
committerMichael Vogel <icarus@dabo.de>
Sun, 4 Jan 2015 19:21:49 +0000 (20:21 +0100)
1  2 
boot.php
include/dbstructure.php

diff --cc boot.php
Simple merge
Simple merge