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: 3e58060 2e6577f)

author	Michael Vogel <icarus@dabo.de>
	Sun, 17 Feb 2013 11:35:40 +0000 (12:35 +0100)
committer	Michael Vogel <icarus@dabo.de>
	Sun, 17 Feb 2013 11:35:40 +0000 (12:35 +0100)
commit	93143702ed5fe88c0fce77d778d86ec651d4331e
tree	e758b78f1f15ce3c8c7331361fd446bd8e14f12b	tree \| snapshot
parent	3e58060b308f045613c3b57b62c0fb47890c7bdb	commit \| diff
parent	2e6577fb32e211782c2abb295cf23b7d40d1d7aa	commit \| diff

Merge remote-tracking branch 'upstream/master'

Conflicts:
boot.php
database.sql
library/fancybox/jquery.fancybox-1.3.4.css
mod/search.php
update.php

16 files changed:

boot.php	diff1 \|	diff2 \|	blob \| history
database.sql	diff1 \|	diff2 \|	blob \| history
include/api.php	diff1 \|	diff2 \|	blob \| history
include/conversation.php	diff1 \|	diff2 \|	blob \| history
include/items.php	diff1 \|	diff2 \|	blob \| history
include/plugin.php	diff1 \|	diff2 \|	blob \| history
include/text.php	diff1 \|	diff2 \|	blob \| history
index.php	diff1 \|	diff2 \|	blob \| history
mod/admin.php	diff1 \|	diff2 \|	blob \| history
mod/item.php	diff1 \|	diff2 \|	blob \| history
mod/network.php	diff1 \|	diff2 \|	blob \| history
mod/photo.php	diff1 \|	diff2 \|	blob \| history
mod/photos.php	diff1 \|	diff2 \|	blob \| history
mod/search.php	diff1 \|	diff2 \|	blob \| history
object/Item.php	diff1 \|	diff2 \|	blob \| history
update.php	diff1 \|	diff2 \|	blob \| history

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