git.mxchange.org Git - friendica.git/commit - view/theme/loozah/photo-menu.jpg

]> git.mxchange.org Git - friendica.git/commit - view/theme/loozah/photo-menu.jpg

projects / friendica.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b48e82d 9b50b0e)

author	Fabio Comuni <fabrix.xm@gmail.com>
	Mon, 4 Apr 2011 07:31:12 +0000 (09:31 +0200)
committer	Fabio Comuni <fabrix.xm@gmail.com>
	Mon, 4 Apr 2011 07:31:12 +0000 (09:31 +0200)
commit	92156cd8403fa1521ecf3c3f9ed3823c03c73dcd
tree	38e7b6573c7162254e56dddcaa1543361ead1dbc	tree \| snapshot
parent	b48e82d12ab3d5ea07f9e8410aacb9c3ae842539	commit \| diff
parent	9b50b0e16f2046b91cb4c734c56024524d8b178b	commit \| diff

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

boot.php	diff1 \|	diff2 \|	blob \| history
mod/message.php	diff1 \|	diff2 \|	blob \| history
mod/network.php	diff1 \|	diff2 \|	blob \| history
view/theme/duepuntozero/style.css	diff1 \|	diff2 \|	blob \| history
view/theme/loozah/style.css	diff1 \|	diff2 \|	blob \| history

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