git.mxchange.org Git - friendica-addons.git/commit - sniper/150x150.jpg

]> git.mxchange.org Git - friendica-addons.git/commit - sniper/150x150.jpg

projects / friendica-addons.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 0d9913f 2a818e8)

author	Fabio Comuni <fabrix.xm@gmail.com>
	Thu, 9 Feb 2012 19:13:36 +0000 (20:13 +0100)
committer	Fabio Comuni <fabrix.xm@gmail.com>
	Thu, 9 Feb 2012 19:13:36 +0000 (20:13 +0100)
commit	858758e92c5d8c1c41e188284fea53ae50fb0855
tree	416bfcd370db53516cb6c0e52d77d1bc14796b26	tree \| snapshot
parent	0d9913f5eb7d9f5bfd0ffb130c985fb5eae20546	commit \| diff
parent	2a818e866f580c39ea403aa6dc31d3a8a2617cf2	commit \| diff

Merge remote-tracking branch 'old/master' into mergeto

js_upload.tgz	diff1 \|	diff2 \|	blob \| history
sniper.tgz	diff1 \|	diff2 \|	blob \| history
uhremotestorage.tgz	diff1 \|	diff2 \|	blob \| history
uhremotestorage/settings.tpl	diff1 \|	diff2 \|	blob \| history
uhremotestorage/uhremotestorage.php	diff1 \|	diff2 \|	blob \| history

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