]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Conflict resolution patch for newnotice.php (zach vs. millette)
authorzach <zach@controlyourself.ca>
Thu, 13 Nov 2008 19:52:37 +0000 (14:52 -0500)
committerzach <zach@controlyourself.ca>
Thu, 13 Nov 2008 19:52:37 +0000 (14:52 -0500)
commit158d6ba1f44b70c189363a0f6e33f2d08fb74abe
treec099ab293499e917d492b76c2a2a1910154993bf
parent0633d0404d5ca75dbb52e6dc6eb50d854bee77d3
Conflict resolution patch for newnotice.php (zach vs. millette)

darcs-hash:20081113195237-462f3-35c44753490c57e30d0adf661ae4c8a08af7e39c.gz
actions/newnotice.php