[Act] Fwd: LPW2015 js seems broken

[Mark Keating]

Hi Alex,

they have become divergent. I will get Tom (who knows Git better than I) 
to sort this out :)

Kind regards

Mark


On 30/11/2015 12:15, Alex Muntada wrote:
> Alex Muntada:
>
>> I prepared a pull request with the new jquery file and script:
>> https://github.com/Act-Conferences/lpw2015/pull/4
> By the way, I see that production and master branches on lpw2015
> have diverged. There are a few commits in master that are not
> present in production and the other way around too.
>
> I'm sorry, I thought that master was the development branch so
> I created the pull request on master. You should probably rebase
> master on production.
>
> Cheers,
> Alex
> _______________________________________________
> Act mailing list
> Act at mongueurs.net
> http://listes.mongueurs.net/mailman/listinfo/act




	
*mark Keating*
Managing Director
t: +44 (0)1524 842155 | m: +44 (0) 7951 557226|
w: www.shadow.cat
w: www.shadownms.com


Facebook <https://www.facebook.com/ShadowcatSystems> Twitter 
<https://twitter.com/shadow_dot_cat> LinkedIn 
<https://uk.linkedin.com/in/markkeating> Flickr 
<https://www.flickr.com/photos/shadowcat_mdk/> Instagram 
<https://instagram.com/shadow_dot_cat/>
Contact me: Google Talk mark.keating Skype shadowcat-mdk
Latest Blog: User Story 
<http://shadow.cat/blog/mark-keating/2015/32-car-user-story/>
Follow teststamp on Twitter <http://www.twitter.com/shadowcat_mdk>
IMPORTANT: The contents of this email and any attachments are 
confidential. They are intended for the named recipient(s) only. If you 
have received this email by mistake, please notify the sender 
immediately and do not disclose the contents to anyone or make copies 
thereof.
Designed with WiseStamp - 
<http://r1.wisestamp.com/r/landing?u=032dffc11b64b6ed&v=null&t=1448885917406&promo=10&dest=http%3A%2F%2Fwww.wisestamp.com%2Femail-install%3Futm_source%3Dextension%26utm_medium%3Demail%26utm_campaign%3Dpromo_10>Get 
yours 
<http://r1.wisestamp.com/r/landing?u=032dffc11b64b6ed&v=null&t=1448885917406&promo=10&dest=http%3A%2F%2Fwww.wisestamp.com%2Femail-install%3Futm_source%3Dextension%26utm_medium%3Demail%26utm_campaign%3Dpromo_10> 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listes.mongueurs.net/archives/act/attachments/20151130/37c33c49/attachment.html>