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: 991656a 428e676)

author	Fabio Comuni <fabrix.xm@gmail.com>
	Mon, 26 Sep 2011 09:42:48 +0000 (11:42 +0200)
committer	Fabio Comuni <fabrix.xm@gmail.com>
	Mon, 26 Sep 2011 09:42:48 +0000 (11:42 +0200)
commit	5792b3d3580b9f09460305858293398d8d8a9abf
tree	90d60e9db4ed733a60c2890c7305d45ddd48be42	tree \| snapshot
parent	991656a3ef396d9a6bd43ddb752627c2880b17ba	commit \| diff
parent	428e6766411d2c6708ad25f726c4bcf1d64af1cc	commit \| diff

Merge branch 'master' into newui

12 files changed:

boot.php	diff1 \|	diff2 \|	blob \| history
include/conversation.php	diff1 \|	diff2 \|	blob \| history
include/template_processor.php	diff1 \|	diff2 \|	blob \| history
include/text.php	diff1 \|	diff2 \|	blob \| history
index.php	diff1 \|	diff2 \|	blob \| history
mod/contacts.php	diff1 \|	diff2 \|	blob \| history
mod/message.php	diff1 \|	diff2 \|	blob \| history
mod/network.php	diff1 \|	diff2 \|	blob \| history
mod/profile.php	diff1 \|	diff2 \|	blob \| history
mod/search.php	diff1 \|	diff2 \|	blob \| history
view/jot-header.tpl	diff1 \|	diff2 \|	blob \| history
view/theme/dispy/jot-header.tpl	diff1 \|	diff2 \|	blob \| history

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