]> git.mxchange.org Git - quix0rs-gnu-social.git/commit - plugins/AnonymousFave/locale/br/LC_MESSAGES/AnonymousFave.po
projects / quix0rs-gnu-social.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5081c56 6ce8134)
Merge branch 'master' into 1.0.x
authorEvan Prodromou <evan@status.net>
Tue, 2 Aug 2011 19:04:14 +0000 (15:04 -0400)
committerEvan Prodromou <evan@status.net>
Tue, 2 Aug 2011 19:04:14 +0000 (15:04 -0400)
commit513c54fa89085fde783a73c298d61576f834b131
tree6b509e9a3e1c890b9ef814af9c3de09a9971819ctree | snapshot
parent5081c56ea49173bb7c5ddb1b6f48487c35076123commit | diff
parent6ce81344719386362d298af34b54d410fdc28d50commit | diff
Merge branch 'master' into 1.0.x

Conflicts:
lib/common.php
README diff1 | diff2 | blob | history
lib/util.php diff1 | diff2 | blob | history
plugins/Meteor/MeteorPlugin.php diff1 | diff2 | blob | history
This is my personal clone from the wonderful software GNUSocial. I may fix or break things here, so use it on your own risk. :-)