]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
Conflicts:
lib/groupeditform.php

1  2 
lib/groupeditform.php patch | diff1 | diff2 | blob | history

diff --cc lib/groupeditform.php
Simple merge
This is my personal clone from the wonderful software GNUSocial. I may fix or break things here, so use it on your own risk. :-)