[Act] Fwd: LPW2015 js seems broken

[L Boivin]

On Act repos, master is indeed the development branch (visible on
http://test.mongueurs.net/<CONF NAME HERE>)
and production is the production branch (nice name, isn't it :)
visible on... hmm... depends on the conference in fact :-)

Laurent

On 30/11/2015 13: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
>