]> git.mxchange.org Git - friendica.git/commit
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)
commit6eaca19f4195a5f8f2c1b6b1e51c6e52bad67d96
tree2dd0bdf8d76dac54b69c2abdf7be661146fd630b
parentd53414a333964026c26c3acee0d953e742a9a633
parentcc56f33b80bdd871b8a1245e3c4bd3a31ed49330
Merge branch 'master' of github.com:annando/friendica

Conflicts:
include/oembed.php