]> git.mxchange.org Git - quix0rs-gnu-social.git/commit - plugins/PiwikAnalytics/locale/pt_BR/LC_MESSAGES/PiwikAnalytics.po
projects / quix0rs-gnu-social.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 69bb30e 7533c7c)
Merge branch '1.0.x' into testing
authorEvan Prodromou <evan@status.net>
Tue, 5 Apr 2011 17:16:28 +0000 (13:16 -0400)
committerEvan Prodromou <evan@status.net>
Tue, 5 Apr 2011 17:16:28 +0000 (13:16 -0400)
commit36b331d469b6dcd1101783f21265f7be624bc58f
tree737e8215568aeb583f4a3f2e13094791096093datree | snapshot
parent69bb30e09c763047c7ef38fb403f40c6c5a51255commit | diff
parent7533c7cfe1bf1adc87ad1f3b9be9271930cc58a5commit | diff
Merge branch '1.0.x' into testing

Conflicts:
plugins/Event/RSVP.php
actions/apigrouplistall.php diff1 | diff2 | blob | history
lib/framework.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. :-)