git.mxchange.org Git - quix0rs-gnu-social.git/commit

]> git.mxchange.org Git - quix0rs-gnu-social.git/commit

Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x

Conflicts:
db/08to09.sql
locale/statusnet.po
scripts/update_po_templates.php

This is my personal clone from the wonderful software GNUSocial. I may fix or break things here, so use it on your own risk. :-)

db/08to09.sql	diff1 \|	diff2 \|	blob \| history
locale/statusnet.po	diff1 \|	diff2 \|	blob \| history
plugins/Facebook/locale/Facebook.po	diff1 \|	diff2 \|	blob \| history
plugins/Gravatar/locale/Gravatar.po	diff1 \|	diff2 \|	blob \| history
plugins/Mapstraction/locale/Mapstraction.po	diff1 \|	diff2 \|	blob \| history
plugins/OStatus/locale/OStatus.po	diff1 \|	diff2 \|	blob \| history
plugins/OpenID/locale/OpenID.po	diff1 \|	diff2 \|	blob \| history
plugins/PoweredByStatusNet/locale/PoweredByStatusNet.po	diff1 \|	diff2 \|	blob \| history
plugins/Sample/locale/Sample.po	diff1 \|	diff2 \|	blob \| history
plugins/TwitterBridge/locale/TwitterBridge.po	diff1 \|	diff2 \|	blob \| history