]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
projects / quix0rs-gnu-social.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit33ee34dc2617fd70cab85212aecb24e01c1e367e
treec8e38e393bf50eeea16709b731997bd5776eac81tree | snapshot
parent39b5957068126be3d0fbe93769daf6038a53f4d4commit | diff
parenta22714b5ee84afe387d3a2671b787822461154b0commit | diff
Merge branch 'uiredesign' of ../evan into uiredesign

Conflicts:

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