JQuery 1.6.1 branch merged

Sun May 15 14:37:39 UTC 2011

On 2011-05-13, at 7:43 PM, Antranig Basman wrote:
> 
> 
> In news which I know will upset a FISH, I seem to have sadly managed to "flip the line" again with this merge,

Fish are not so easily upset as that.  :)

> 
> git merge --log harriswong/FLUID-4113
> 

I believe that if you'd used the --no-ff flag then the line would have stayed the same. 

It's exciting to have the jquery upgrade in the project repo now - thanks everyone!

Michelle

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://fluidproject.org/pipermail/fluid-work/attachments/20110515/9e7f5194/attachment.html>