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: 019b735 2e43b29)

author	Fabio Comuni <fabrix.xm@gmail.com>
	Fri, 16 Sep 2011 07:39:29 +0000 (09:39 +0200)
committer	Fabio Comuni <fabrix.xm@gmail.com>
	Fri, 16 Sep 2011 07:39:29 +0000 (09:39 +0200)
commit	9d2afc2d3c12f6b70eae11487e491e2d8604ed60
tree	ced4fb400d25762866a773115b122f6c9cc498de	tree \| snapshot
parent	019b735ec75989336826e5ad5db6377803ecb050	commit \| diff
parent	2e43b291e73f6d7c36a9d8743fc2635dc3444841	commit \| diff

Merge remote-tracking branch 'friendika/master' into newui

boot.php	diff1 \|	diff2 \|	blob \| history
include/template_processor.php	diff1 \|	diff2 \|	blob \| history
include/text.php	diff1 \|	diff2 \|	blob \| history
js/acl.js	diff1 \|	\|	blob \| history
js/main.js	diff1 \|	\|	blob \| history
mod/network.php	diff1 \|	diff2 \|	blob \| history
mod/search.php	diff1 \|	diff2 \|	blob \| history

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