]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d53414a cc56f33)
Merge branch 'master' of github.com:annando/friendica
authorMichael <icarus@dabo.de>
Mon, 18 Jun 2012 06:51:12 +0000 (08:51 +0200)
committerMichael <icarus@dabo.de>
Mon, 18 Jun 2012 06:51:12 +0000 (08:51 +0200)
Conflicts:
include/oembed.php


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.