git.mxchange.org Git - friendica.git/commit

]> git.mxchange.org Git - friendica.git/commit

projects / friendica.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 5f400c4 a153621)

author	Michael Vogel <icarus@dabo.de>
	Fri, 13 Jul 2012 21:39:51 +0000 (23:39 +0200)
committer	Michael Vogel <icarus@dabo.de>
	Fri, 13 Jul 2012 21:39:51 +0000 (23:39 +0200)
commit	bfca7f47ef1f986ea8515d23c3c1962c7fe3a298
tree	423d7bea6cf9bc91ae6445ca246ca00c00229328	tree \| snapshot
parent	5f400c4a9798d04c267cc05f2250a6c810802553	commit \| diff
parent	a153621f71acf33768672b3bce312aae3a1b7059	commit \| diff

Merge remote branch 'upstream/master'

Conflicts:
include/bb2diaspora.php

include/bb2diaspora.php	diff1 \|	diff2 \|	blob \| history
include/bbcode.php	diff1 \|	diff2 \|	blob \| history
include/dba.php	diff1 \|	diff2 \|	blob \| history
include/items.php	diff1 \|	diff2 \|	blob \| history
include/network.php	diff1 \|	diff2 \|	blob \| history

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