]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 11c8281 d9f28b9)
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)
Conflicts:
boot.php
update.php

1  2 
include/dbstructure.php patch | diff1 | diff2 | blob | history

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