]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
projects / quix0rs-gnu-social.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c4b8f68 b716d01)
Merge remote branch 'gitorious/1.0.x' into 1.0.x
authorEvan Prodromou <evan@status.net>
Sun, 14 Nov 2010 11:49:43 +0000 (06:49 -0500)
committerEvan Prodromou <evan@status.net>
Sun, 14 Nov 2010 11:49:43 +0000 (06:49 -0500)
commit01f32e3998b8d031d2a39e2d0506253142b6632e
tree952174eeb2fa746c97b9884cf4797ffa3f9870cetree | snapshot
parentc4b8f68a1a3ed6422a2ed1cb7a8b5b5c65011b5fcommit | diff
parentb716d01a41c54c06676a1e54a48c36e05755a247commit | diff
Merge remote branch 'gitorious/1.0.x' into 1.0.x

Conflicts:
actions/urlsettings.php
actions/urlsettings.php diff1 | | 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. :-)