git.mxchange.org Git - friendica.git/commit - view/theme/diabook-red/icons/contacts.png

]> git.mxchange.org Git - friendica.git/commit - view/theme/diabook-red/icons/contacts.png

projects / friendica.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: a3f08c4 53157bb)

author	Michael Vogel <icarus@dabo.de>
	Wed, 9 May 2012 12:56:48 +0000 (14:56 +0200)
committer	Michael Vogel <icarus@dabo.de>
	Wed, 9 May 2012 12:56:48 +0000 (14:56 +0200)
commit	f2e648d62fe7cafb9a55c7505687ea4d1c294778
tree	07a1b31339ccd871bb4fbfe73e3f0d4911689795	tree \| snapshot
parent	a3f08c44be78d4517e9f1619811def09b2ec7e7a	commit \| diff
parent	53157bb954acb7597347c6b4a87e64e7a2f6cc79	commit \| diff

Merge remote branch 'upstream/master'

include/api.php

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