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: b4c3f02 e97a579)

author	Michael Vogel <icarus@dabo.de>
	Sun, 5 Jan 2014 15:22:42 +0000 (16:22 +0100)
committer	Michael Vogel <icarus@dabo.de>
	Sun, 5 Jan 2014 15:22:42 +0000 (16:22 +0100)
commit	aed28a24f158535cff11a60bad45b0b4fd4ef2ce
tree	a814698f06d895a6907a617e78c024ee0ea2a054	tree \| snapshot
parent	b4c3f0253876894ea16f4d86a9ca22a2f135fce8	commit \| diff
parent	e97a579856ba4d733d61005d9f241b3b81d703cd	commit \| diff

Merge remote-tracking branch 'upstream/master'

Conflicts:
mod/crepair.php

13 files changed:

boot.php	diff1 \|	diff2 \|	blob \| history
include/api.php	diff1 \|	diff2 \|	blob \| history
include/conversation.php	diff1 \|	diff2 \|	blob \| history
include/ostatus_conversation.php	diff1 \|	diff2 \|	blob \| history
library/slinky.php	diff1 \|	diff2 \|	blob \| history
mod/contacts.php	diff1 \|	diff2 \|	blob \| history
mod/crepair.php	diff1 \|	diff2 \|	blob \| history
mod/parse_url.php	diff1 \|	diff2 \|	blob \| history
mods/readme.txt	diff1 \|	diff2 \|	blob \| history
view/templates/crepair.tpl	diff1 \|	diff2 \|	blob \| history
view/theme/vier/style.css	diff1 \|	diff2 \|	blob \| history
view/theme/vier/templates/threaded_conversation.tpl	diff1 \|	diff2 \|	blob \| history
view/theme/vier/templates/wall_thread.tpl	diff1 \|	diff2 \|	blob \| history

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