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: 6c423fe db03b1a)

author	fabrixxm <fabrix.xm@gmail.com>
	Wed, 17 Aug 2011 15:35:37 +0000 (17:35 +0200)
committer	fabrixxm <fabrix.xm@gmail.com>
	Wed, 17 Aug 2011 15:35:37 +0000 (17:35 +0200)
commit	bdf42473a0341f291cd256323d122aa80bb0cb0b
tree	922a5ba24a34d7ea89673019e82f68436edb7091	tree \| snapshot
parent	6c423feed2d8bc5bd36d2a1cbac073915e523749	commit \| diff
parent	db03b1ab173d61b1ee75271dac1e48f3475ad42c	commit \| diff

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

include/main.js	diff1 \|	diff2 \|	blob \| history
mod/contacts.php	diff1 \|	diff2 \|	blob \| history
mod/network.php	diff1 \|	diff2 \|	blob \| history
mod/notifications.php	diff1 \|	diff2 \|	blob \| history
mod/profile.php	diff1 \|	diff2 \|	blob \| history
mod/profiles.php	diff1 \|	diff2 \|	blob \| history

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