]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
projects / quix0rs-gnu-social.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1a96a5e 70cf37c)
Merge branch 'testing' into privategroup
authorEvan Prodromou <evan@status.net>
Thu, 3 Feb 2011 17:56:55 +0000 (12:56 -0500)
committerEvan Prodromou <evan@status.net>
Thu, 3 Feb 2011 17:56:55 +0000 (12:56 -0500)
commit99db745f9d8746e3170bf779746d855c44f0b951
treebcaa4ee87adbc0079e9c7e534be42ab05a9627fetree | snapshot
parent1a96a5e695e76f4a7e91ffe10e5ca0b5ccbfccafcommit | diff
parent70cf37cb8884740c3aa5db7df728336cf5215604commit | diff
Merge branch 'testing' into privategroup

Conflicts:
lib/groupeditform.php
lib/groupeditform.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. :-)