]> 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: 39b5957 a22714b)
Merge branch 'uiredesign' of ../evan into uiredesign
authorsarven <csarven@plantard.controlezvous.ca>
Thu, 15 Jan 2009 23:18:56 +0000 (23:18 +0000)
committersarven <csarven@plantard.controlezvous.ca>
Thu, 15 Jan 2009 23:18:56 +0000 (23:18 +0000)
Conflicts:

lib/action.php

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

diff --cc lib/action.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. :-)